test
Merge branch 'hotfix/bug1'
fix bug for exceptions