New exception
Nested exception
Merge branch 'feature/exception' into develop