Adding exceptions as a feature