Add a exception test
Merge branch 'develop'