ENH: Improve error message consistency.