[fix] Error Reports
Merge pull request #2081 from anandpdoshi/anand-august-19

[fix] Error Reports