2013.07 - bugzid 3847: added null check