Correct Sonar Critical Violations (#80)
- Avoid Catching Throwable