Add some more reporter error handling