Improve Automatic Error Reporting

All changes noted in the code.