bugz 4662: fixed NPE
Merge pull request #53 from daniellemayne/develop

bugz 4662: fixed NPE - develop