Bug 912238 - The last rescue was catching exit.
Merge pull request #1465 from rmillner/BZ912238

Merged by openshift-bot