fixed wrong try catch construct
Merge branch 'master' into test