ItemStack sensitive, NPE fix