TRUNK-4225: SonarQube - Avoid Catching Throwable
Merge pull request #553 from lrozanski/TRUNK-4225

TRUNK-4225: SonarQube - Avoid Catching Throwable