[IMP] Improved exception handling