Improve wording of error messages