Fix whitespace pep8 issue
Make reporter more robust

Handle a couple exceptions that may happen with no worse loss of data
than if we crashed (will need to handle data loss some other time).
Merge branch 'master' into server_pcap