Make sure errors can be caught
Merge pull request #162 from Financial-Times/catch-errors

Make sure errors can be caught