Changed the way some error messages are called.