More exception handling improvements