diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java b/fml/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
index e5f7db3a5..71a092544 100644
--- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
+++ b/fml/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
@@ -20,7 +20,7 @@ public class FMLSecurityManager extends SecurityManager {
             String callingClass = classContexts.length > 3 ? classContexts[4].getName() : "none";
             String callingParent = classContexts.length > 4 ? classContexts[5].getName() : "none";
             // FML is allowed to call system exit and the Minecraft applet (from the quit button)
-            if (!(callingClass.startsWith("cpw.mods.fml.") || ( "net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent))))
+            if (!(callingClass.startsWith("cpw.mods.fml.") || ( "net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent)) || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) && "net.minecraft.server.MinecraftServer".equals(callingParent))))
             {
                 throw new ExitTrappedException();
             }