Adds null checking for keys

Stupid customItemStack
Merge pull request #446 from hilburn/master

Adds null checking for keys