Correct Sonar Critical Violations (#80)
- Correctness - Possible null pointer dereference in method on exception path