Better exception handling
Better exception handling

Picked from 0.2 stable

Signed-off-by: Thomas von Deyen <0376b026ffa11ba0925bd40d8bbba6086726c569@gmail.com>

magiclabs/csv_magic,magiclabs/csv_magic,magiclabs/csv_magic