More error reporting improvemnts.