update null checks to use getKey method
Merge pull request #280 from way2muchnoise/1.7-update

update null checks to use getKey method for #270