fixed issue with exceptions
Merge branch 'master' into 0.0.x-dev
added exception level handling
Merge branch 'master' into 0.0.x-dev