diff --git a/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java b/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java
index d12a5de..a6ba56f 100644
--- a/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java
+++ b/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java
@@ -262,12 +262,12 @@ public final class CitizensCMD extends JavaPlugin {
     private void registerEvents() {
         final PluginManager pm = getServer().getPluginManager();
         pm.registerEvents(new UpdateEvent(this), this);
-        pm.registerEvents(new NPCClickListener(this), this);
 
         try {
+            pm.registerEvents(new NPCClickListener(this), this);
             pm.registerEvents(new NPCListener(this), this);
         } catch (final Exception ex) {
-            audiences.console().sendMessage(LEGACY.deserialize("&cCould not register clone event, please update your Citizens."));
+            audiences.console().sendMessage(TAG.append(LEGACY.deserialize("&cCould not register NPC events, please update your Citizens plugin!")));
         }
     }
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/files/DataHandler.java b/src/main/java/me/mattstudios/citizenscmd/files/DataHandler.java
index e9393b2..e6989de 100644
--- a/src/main/java/me/mattstudios/citizenscmd/files/DataHandler.java
+++ b/src/main/java/me/mattstudios/citizenscmd/files/DataHandler.java
@@ -19,7 +19,6 @@
 package me.mattstudios.citizenscmd.files;
 
 import static me.mattstudios.citizenscmd.utility.Util.HEADER;
-import static me.mattstudios.citizenscmd.utility.Util.LEGACY;
 
 import java.io.File;
 import java.io.IOException;
@@ -80,7 +79,7 @@ public class DataHandler {
             try {
                 savesFile.createNewFile();
             } catch (final IOException e) {
-                plugin.getAudiences().console().sendMessage(LEGACY.deserialize("&cError creating saves file.."));
+                e.printStackTrace();
             }
         }
     }
@@ -229,7 +228,8 @@ public class DataHandler {
             }
 
             dataConfigurator.save(savesFile);
-        } catch (IOException | InvalidConfigurationException ignored) {
+        } catch (IOException | InvalidConfigurationException e) {
+            e.printStackTrace();
         }
     }
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
index fdec66e..4718b9e 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
@@ -66,8 +66,8 @@ public class NPCClickListener implements Listener {
         Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "BungeeCord");
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onRightClick(NPCRightClickEvent event) {
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onNPCRightClick(NPCRightClickEvent event) {
         final NPC npc = event.getNPC();
         final Player player = event.getClicker();
         final Audience audience = plugin.getAudiences().player(player);
@@ -149,8 +149,8 @@ public class NPCClickListener implements Listener {
 
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onLeftClick(NPCLeftClickEvent event) {
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onNPCLeftClick(NPCLeftClickEvent event) {
         final NPC npc = event.getNPC();
         final Player player = event.getClicker();
         final Audience audience = plugin.getAudiences().player(player);
diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
index 76c8fab..e2d5e5d 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 
 import me.mattstudios.citizenscmd.CitizensCMD;
 import net.citizensnpcs.api.event.NPCCloneEvent;
-import net.citizensnpcs.api.event.NPCRemoveEvent;
+import net.citizensnpcs.api.event.NPCRemoveByCommandSenderEvent;
 
 public class NPCListener implements Listener {
 
@@ -16,8 +16,8 @@ public class NPCListener implements Listener {
         this.plugin = plugin;
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onCloneNPC(NPCCloneEvent event) {
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onNPCClone(NPCCloneEvent event) {
         if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
             return;
         }
@@ -25,8 +25,8 @@ public class NPCListener implements Listener {
         plugin.getDataHandler().cloneData(event.getNPC().getId(), event.getClone().getId());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onRemoveNPC(NPCRemoveEvent event) {
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onNPCRemove(NPCRemoveByCommandSenderEvent event) {
         if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
             return;
         }
diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java b/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java
index 41ae39b..2f21a28 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java
@@ -42,7 +42,7 @@ public class UpdateEvent implements Listener {
         this.plugin = plugin;
     }
 
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerJoin(PlayerJoinEvent event) {
         if (!plugin.isUpdateStatus() || !event.getPlayer().hasPermission("citizenscmd.update")) {
             return;