Remove possible null pointer dereference
Merge pull request #1060 from ArloL/patch-18

Remove possible null pointer dereference