TRUNK-4228: SonarQube - Nullcheck of value previously dereferenced
Merge pull request #568 from tadeitto/TRUNK-4228

TRUNK-4228: SonarQube - Nullcheck of value previously dereferenced