Improve wording in error messages.