Merge branch 'feature/error-handling' into develop
Merge branch 'develop' of github.com:usersource/anno into develop