Improve the error messages