develop - bugzid 3847: added null check