Merge pull request #273 from way2muchnoise/1.7-update

extra null check, #270
update null checks to use getKey method