Enchantment NPE bugfix