Improved exception treatment