diff --git a/src/engine/Enum.java b/src/engine/Enum.java
index dd92087e..89b0f995 100644
--- a/src/engine/Enum.java
+++ b/src/engine/Enum.java
@@ -50,7 +50,6 @@ public class Enum {
 	}
 
 	public enum MonsterType implements EnumBitSetHelper<MonsterType> {
-		None,
 		Aelfborn,
 		All,
 		Animal,
diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index a07bfdc2..ea583a99 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -1718,10 +1718,12 @@ public class Mob extends AbstractIntelligenceAgent {
             Logger.error("Null equipset returned for uuid " + currentID);
             this.equip = new HashMap<>(0);
         }
-
         // Combine mobbase and mob aggro arrays into one bitvector
-        this.notEnemy.addAll(this.getMobBase().notEnemy);
-        this.enemy.addAll(this.getMobBase().enemy);
+        if(this.getMobBase().notEnemy.size() > 0)
+            this.notEnemy.addAll(this.getMobBase().notEnemy);
+
+        if(this.getMobBase().enemy.size() > 0)
+            this.enemy.addAll(this.getMobBase().enemy);
 
         try {
             NPCManager.applyRuneSetEffects(this);