[BISERVER-11606] Guarding against NPE
Merge pull request #1606 from rmansoor/BISERVER-11606

[BISERVER-11606] Guarding against NPE