exception vocabulary fixes