Update to error reporting