TRUNK-4225: SonarQube - Avoid Catching Throwable