Fixing exception vocabulary