Improved exception messaging