Index: binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs	(revision 325)
+++ binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs	(revision 326)
@@ -4,10 +4,7 @@
 
 		protected override EntityAnimal predicate (Entity _e) {
-			if (_e is EntityAnimal) {
-				EntityAnimal ea = (EntityAnimal) _e;
-
-				if (ea.IsAlive ()) {
-					return ea;
-				}
+			EntityAnimal ea = _e as EntityAnimal;
+			if (ea != null && ea.IsAlive ()) {
+				return ea;
 			}
 
Index: binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs	(revision 325)
+++ binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs	(revision 326)
@@ -4,8 +4,7 @@
 
 		protected override EntityEnemy predicate (Entity _e) {
-			if (_e is EntityEnemy) {
-				if (_e.IsAlive ()) {
-					return _e as EntityEnemy;
-				}
+			EntityEnemy enemy = _e as EntityEnemy;
+			if (enemy != null && enemy.IsAlive ()) {
+				return enemy;
 			}