Added some improved error handling for the reports