Correct Sonar Critical Violations (#80)
- Dodgy - Method uses the same code for two branches