diff --git a/src/main/java/cpw/mods/fml/common/LoadController.java b/src/main/java/cpw/mods/fml/common/LoadController.java
index e7807525cc..826cab7adc 100644
--- a/src/main/java/cpw/mods/fml/common/LoadController.java
+++ b/src/main/java/cpw/mods/fml/common/LoadController.java
@@ -206,7 +206,7 @@ public class LoadController
         FMLLog.log(modId, Level.TRACE, "Sending event %s to mod %s", stateEvent.getEventType(), modId);
         eventChannels.get(modId).post(stateEvent);
         FMLLog.log(modId, Level.TRACE, "Sent event %s to mod %s", stateEvent.getEventType(), modId);
-        ThreadContext.put("mod", "<NONE>");
+        ThreadContext.remove("mod");
         activeContainer = null;
         if (stateEvent instanceof FMLStateEvent)
         {
diff --git a/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java b/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java
index 4c59a05c2d..713d21b636 100644
--- a/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java
+++ b/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java
@@ -42,7 +42,7 @@ public class ASMEventHandler implements IEventListener
         }
         else
         {
-            ThreadContext.put("mod", "<NONE>");
+            ThreadContext.put("mod", "");
         }
         if (handler != null)
         {