Issue 2285 - check for null data before accessing
Merge pull request #490 from hssm/Issue2285

Issue 2285