diff --git a/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java b/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java
index 68b9926705..1bd4f6e85f 100644
--- a/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java
+++ b/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java
@@ -40,14 +40,8 @@ public class ASMEventHandler implements IEventListener
     @Override
     public void invoke(Event event)
     {
-        if (owner != null && GETCONTEXT)
-        {
-            ThreadContext.put("mod", owner.getName());
-        }
-        else if (GETCONTEXT)
-        {
-            ThreadContext.put("mod", "");
-        }
+        if (GETCONTEXT)
+            ThreadContext.put("mod", owner == null ? "" : owner.getName());
         if (handler != null)
         {
             if (!event.isCancelable() || !event.isCanceled() || subInfo.receiveCanceled())