Improved error message consistency.