put a bunch of throwable catches back
fix compile error
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup