More error reporting improvements.