--- ../src-base/minecraft/net/minecraft/entity/EntityList.java
+++ ../src-work/minecraft/net/minecraft/entity/EntityList.java
@@ -153,9 +153,10 @@
             p_75615_0_.func_82580_o("Type");
         }
 
+        Class oclass = null;
         try
         {
-            Class oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
+            oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
 
             if (oclass != null)
             {
@@ -169,7 +170,17 @@
 
         if (entity != null)
         {
+            try
+            {
             entity.func_70020_e(p_75615_0_);
+            }
+            catch (Exception e)
+            {
+                net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+                        "An Entity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
+                        p_75615_0_.func_74779_i("id"), oclass.getName());
+                entity = null;
+            }
         }
         else
         {
