Fix to the error reporting fix.