Improved TryCatch
Merge pull request #20 from fd/master

Improved TryCatch (by Simon Menke)