Improve exception code