Add basic error reporting fix