support for top level exceptions handling
small code fix
Merge branch 'origin/master'