Bug 1094541 - check for null values
Merge pull request #5384 from lnader/master

Merged by openshift-bot