Further error reporting fixes.