#TRUNK-4227: SonarQube - Correctness - Possible null pointer dereference
Merge pull request #573 from jkondrat/TRUNK-4227

#TRUNK-4227: SonarQube - Correctness - Possible null pointer dereference