Add better catches for exceptions
Merge branch 'feature/refactor' into develop
Merge branch 'develop'