Fixed: More error message changes.