ItemDef NPE Fix