Improve error message wording. #1916