fixed exception variables
Merge branch 'hotfix/exception-variables'