Fixed the error messages