Enhance the error messages