Fix double handling of exceptions
Merge pull request #2312 from ForbesLindesay/fix-double-exception-handling

Fix double handling of exceptions