More error message improvements