diff --git a/src/main/java/net/minecraft/entity/DataWatcher.java b/src/main/java/net/minecraft/entity/DataWatcher.java
index 7356956..bd41b41 100644
--- a/src/main/java/net/minecraft/entity/DataWatcher.java
+++ b/src/main/java/net/minecraft/entity/DataWatcher.java
@@ -204,7 +204,8 @@
 		while (iterator.hasNext())
 		{
 			DataWatcher.WatchableObject watchableobject = (DataWatcher.WatchableObject)iterator.next();
-			if(watchableobject.getObject() == null)
+			int type = watchableobject.getObjectType();
+			if(type < 7 && type != 5 && watchableobject.getObject() == null)
 			{
 				field_151511_a.setDead();
 				FMLLog.warning("Removed entity with broken DataWatcher! Class: %s Object: %s", field_151511_a.getClass(), field_151511_a);