From de24eea8858a49159edaf10ee5ca35263db35a81 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 17 Sep 2012 04:56:26 -0700
Subject: [PATCH] Fix potential NPE in Custom item entity span code caused by
 item id misconfigurations.

---
 common/net/minecraftforge/common/ForgeInternalHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/net/minecraftforge/common/ForgeInternalHandler.java b/common/net/minecraftforge/common/ForgeInternalHandler.java
index c7020d9118..95fc2e82fc 100644
--- a/common/net/minecraftforge/common/ForgeInternalHandler.java
+++ b/common/net/minecraftforge/common/ForgeInternalHandler.java
@@ -13,7 +13,7 @@ public class ForgeInternalHandler
         if (entity instanceof EntityItem)
         {
             ItemStack item = ((EntityItem)entity).item;
-            if (item.getItem().hasCustomEntity(item))
+            if (item != null && item.getItem().hasCustomEntity(item))
             {
                 Entity newEntity = item.getItem().createEntity(event.world, entity, item);
                 if (newEntity != null)