Make error message more consistent