Merge pull request #80 from kmillikin/issue-79

Handle failure of 'on T catch' clauses properly.