Error Reporting fix