Catch some more exceptions and make errors sane
Merge pull request #6 from guardian/catch-more-exceptions

Catch some more exceptions and make errors sane