--- ../src-base/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
+++ ../src-work/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
@@ -287,11 +287,20 @@
                 Entity entity = (Entity)iterator.next();
                 nbttagcompound1 = new NBTTagCompound();
 
+                try
+                {
                 if (entity.func_70039_c(nbttagcompound1))
                 {
                     p_75820_1_.func_177409_g(true);
                     nbttaglist1.func_74742_a(nbttagcompound1);
                 }
+                }
+                catch (Exception e)
+                {
+                    net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+                            "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author",
+                            entity.getClass().getName());
+                }
             }
         }
 
@@ -303,8 +312,17 @@
         {
             TileEntity tileentity = (TileEntity)iterator.next();
             nbttagcompound1 = new NBTTagCompound();
+            try
+            {
             tileentity.func_145841_b(nbttagcompound1);
             nbttaglist2.func_74742_a(nbttagcompound1);
+            }
+            catch (Exception e)
+            {
+                net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+                        "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author",
+                        tileentity.getClass().getName());
+            }
         }
 
         p_75820_3_.func_74782_a("TileEntities", nbttaglist2);
