diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
deleted file mode 100644
index 01bcea59a..000000000
--- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
-
-/**
- * Listener for listening to our own events, only really useful for catching errors
- */
-public class SelfListener implements Listener {
-
-    /**
-     * Monitor internal XP gain events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler
-    public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
-        int xp = event.getXpGained();
-
-        if(xp < 0) {
-            try {
-                throw new Exception("Gained negative XP!");
-            }
-            catch (Exception e) {
-                System.out.println(e.getMessage());
-                e.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/gmail/nossr50/util/Permissions.java b/src/main/java/com/gmail/nossr50/util/Permissions.java
index b447950f3..ec29dcf82 100644
--- a/src/main/java/com/gmail/nossr50/util/Permissions.java
+++ b/src/main/java/com/gmail/nossr50/util/Permissions.java
@@ -32,6 +32,9 @@ public class Permissions {
     /*
      * MCMMO.BYPASS.*
      */
+    public boolean hardcoremodeBypass(Player player) {
+        return player.hasPermission("mcmmo.bypass.hardcoremode");
+    }
     public boolean arcaneBypass(Player player) {
         return player.hasPermission("mcmmo.bypass.arcanebypass");
     }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 18b3aaeda..ee1556f0f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -142,9 +142,12 @@ permissions:
     mcmmo.bypass.*:
         description: Implies all bypass permissions.
         children:
+            mcmmo.bypass.hardcoremode: true
             mcmmo.bypass.arcanebypass: true
             mcmmo.bypass.inspect.distance: true
             mcmmo.bypass.inspect.offline: true
+    mcmmo.bypass.hardcoremode:
+        description: Allows user to bypass the negative effects of death from Hardcore mode
     mcmmo.bypass.arcanebypass:
         description: Allows user to bypass Arcane Repair so he will never lose enchantments
     mcmmo.bypass.inspect.distance: