[fix] fixed potentially NPE bug
[cleanup] fixed Sonar violations
Merge pull request #39 from tkrille/OSNG-196

Osng 196