Correct Sonar Critical Violations (#80)
- Dodgy - Redundant nullcheck of value known to be non-null