Made exception messages more uniform