Improved exception clarity