Catch exception
Merge branch 'feature/bugfixing' into develop