diff --git a/pom.xml b/pom.xml
index f7968506a..c65ae5c23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,11 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>LATEST</craftbukkit.version>
-		<citizensapi.version>2.0.4-SNAPSHOT</citizensapi.version>
-		<vault.version>1.2.18-SNAPSHOT</vault.version>
+		<citizensapi.version>[2.0.4-SNAPSHOT,)</citizensapi.version>
+		<vault.version>1.2.19-SNAPSHOT</vault.version>
 		<powermock.version>1.4.12</powermock.version>
 		<build.number>Unknown</build.number>
+		<BUILD_NUMBER>Unknown</BUILD_NUMBER>
 	</properties>
 
 	<repositories>
@@ -34,13 +35,6 @@
 	</repositories>
 
 	<dependencies>
-		<dependency>
-			<groupId>net.milkbowl.vault</groupId>
-			<artifactId>Vault</artifactId>
-			<version>${vault.version}</version>
-			<type>jar</type>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>craftbukkit</artifactId>
@@ -55,6 +49,13 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>net.milkbowl.vault</groupId>
+			<artifactId>Vault</artifactId>
+			<version>${vault.version}</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
index 930bf4904..6aeebb9d2 100644
--- a/src/main/java/net/citizensnpcs/EventListen.java
+++ b/src/main/java/net/citizensnpcs/EventListen.java
@@ -20,7 +20,7 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.trait.Owner;
 import net.citizensnpcs.editor.Editor;
-import net.citizensnpcs.npc.entity.EntityHumanNPC;
+import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.CurrentLocation;
 import net.citizensnpcs.util.Messages;
 import net.citizensnpcs.util.Messaging;
@@ -128,10 +128,9 @@ public class EventListen implements Listener {
 
     @EventHandler
     public void onEntityDamage(EntityDamageEvent event) {
-        if (!npcRegistry.isNPC(event.getEntity()))
-            return;
-
         NPC npc = npcRegistry.getNPC(event.getEntity());
+        if (npc == null)
+            return;
         event.setCancelled(npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true));
         if (event instanceof EntityDamageByEntityEvent) {
             NPCDamageByEntityEvent damageEvent = new NPCDamageByEntityEvent(npc,
@@ -155,9 +154,9 @@ public class EventListen implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onEntityDeath(EntityDeathEvent event) {
-        if (!npcRegistry.isNPC(event.getEntity()))
-            return;
         NPC npc = npcRegistry.getNPC(event.getEntity());
+        if (npc == null)
+            return;
         Bukkit.getPluginManager().callEvent(new NPCDeathEvent(npc, event));
         npc.despawn(DespawnReason.DEATH);
     }
@@ -170,10 +169,9 @@ public class EventListen implements Listener {
 
     @EventHandler
     public void onEntityTarget(EntityTargetEvent event) {
-        if (!npcRegistry.isNPC(event.getTarget()))
-            return;
         NPC npc = npcRegistry.getNPC(event.getTarget());
-
+        if (npc == null)
+            return;
         event.setCancelled(npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true));
         Bukkit.getPluginManager().callEvent(new EntityTargetNPCEvent(event, npc));
     }
@@ -181,7 +179,7 @@ public class EventListen implements Listener {
     @EventHandler(ignoreCancelled = true)
     public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
         EntityPlayer handle = ((CraftPlayer) event.getPlayer()).getHandle();
-        if (!(handle instanceof EntityHumanNPC))
+        if (!(handle instanceof NPCHolder))
             return;
         ((CraftServer) Bukkit.getServer()).getHandle().players.remove(handle);
         // on teleport, player NPCs are added to the server player list. this is