added null check
Merge pull request #17 from daniellemayne/develop

develop - bugzid 3847: added null check