More error message tweaking.