bugz 4662: fixed NPE
Merge pull request #52 from daniellemayne/2014.05

bugz 4662: fixed NPE - 2014.05