Merge pull request #46 from m15a/fix-catch-in-case-try-match-try

Merge pull request #46 from m15a/fix-catch-in-case-try-match-try #29