From 99bb50d8f8d27217ba58a41c802a504213e99461 Mon Sep 17 00:00:00 2001
From: CovertJaguar <covertjaguar@gmail.com>
Date: Mon, 29 Apr 2013 20:41:20 -0700
Subject: [PATCH] Improved Entity Spawn Error

---
 common/cpw/mods/fml/common/network/EntitySpawnPacket.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/cpw/mods/fml/common/network/EntitySpawnPacket.java b/common/cpw/mods/fml/common/network/EntitySpawnPacket.java
index 118bf338a9..a855f402e3 100644
--- a/common/cpw/mods/fml/common/network/EntitySpawnPacket.java
+++ b/common/cpw/mods/fml/common/network/EntitySpawnPacket.java
@@ -184,8 +184,7 @@ public class EntitySpawnPacket extends FMLPacket
         ModContainer mc = nmh.getContainer();
 
         EntityRegistration registration = EntityRegistry.instance().lookupModSpawn(mc, modEntityId);
-        Class<? extends Entity> cls =  registration.getEntityClass();
-        if (cls == null)
+        if (registration == null || registration.getEntityClass() == null)
         {
             FMLLog.log(Level.WARNING, "Missing mod entity information for %s : %d", mc.getModId(), modEntityId);
             return;