Fix additional exception messages