Remove catch execption
simple refactor
Merge branch 'fix-test-exceptions' into develop