More work to improve exception handling