guarding against null call to fix Code Analysis error
Merge pull request #340 from blairconrad/fix-code-analysis

guarding against null call to fix Code Analysis error