Attempt fix of null ItemStack