More error message improvements.