Removed exception test for now
Merge branch 'hotfix/0.0.6'