Improved the magic words for error messages