Make error messages consistent