more revision to the error messages