Improve error message consistency