diff --git a/L2J_Mobius_Helios/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Helios/dist/game/data/stats/npcs/20100-20199.xml
index a146d7c328..202b588e37 100644
--- a/L2J_Mobius_Helios/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Helios/dist/game/data/stats/npcs/20100-20199.xml
@@ -495,7 +495,7 @@
-
+
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index 736d8a2778..e7ca4d2583 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -37,6 +37,7 @@ import org.w3c.dom.Node;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.enums.AISkillScope;
import com.l2jmobius.gameserver.enums.MpRewardAffectType;
import com.l2jmobius.gameserver.enums.MpRewardType;
@@ -659,7 +660,11 @@ public class NpcData implements IGameXmlReader
case "item":
{
final IDropItem dropItem = dropListScope.newDropItem(parseInteger(attrs, "id"), parseLong(attrs, "min"), parseLong(attrs, "max"), parseDouble(attrs, "chance"));
- if (dropItem != null)
+ if (ItemTable.getInstance().getTemplate(parseInteger(attrs, "id")) == null)
+ {
+ LOGGER.warning("DropListItem: Could not find item with id " + parseInteger(attrs, "id") + ".");
+ }
+ else if (dropItem != null)
{
drops.add(dropItem);
}
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/20100-20199.xml
index 660825e595..d0bcd11884 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/20100-20199.xml
@@ -542,7 +542,7 @@
-
+
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index 736d8a2778..e7ca4d2583 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -37,6 +37,7 @@ import org.w3c.dom.Node;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.enums.AISkillScope;
import com.l2jmobius.gameserver.enums.MpRewardAffectType;
import com.l2jmobius.gameserver.enums.MpRewardType;
@@ -659,7 +660,11 @@ public class NpcData implements IGameXmlReader
case "item":
{
final IDropItem dropItem = dropListScope.newDropItem(parseInteger(attrs, "id"), parseLong(attrs, "min"), parseLong(attrs, "max"), parseDouble(attrs, "chance"));
- if (dropItem != null)
+ if (ItemTable.getInstance().getTemplate(parseInteger(attrs, "id")) == null)
+ {
+ LOGGER.warning("DropListItem: Could not find item with id " + parseInteger(attrs, "id") + ".");
+ }
+ else if (dropItem != null)
{
drops.add(dropItem);
}