try catch revival
Merge pull request #1 from SaschaNaz/master

try catch revival