Make error wording more consistent