Changing exception messages to make them more consistent