removed test for exception
Merge branch 'hotfix/2.1.1'