ItemStack sensitive, NPE fix
ItemStack sensitive
Merge pull request #1 from ReikaKalseki/master

I like the way you think ;)