Revert to catching all exceptions