Merge pull request #5378 from lnader/master

Merged by openshift-bot
Bug 1094541 - check for null values