improved exception handling #273