#1314 Removed references to Exceptional