Improved some of the error messages