diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java
index d427a0c354..0bb676eff3 100644
--- a/common/cpw/mods/fml/common/Loader.java
+++ b/common/cpw/mods/fml/common/Loader.java
@@ -496,7 +496,7 @@ public class Loader
      */
     public static boolean isModLoaded(String modname)
     {
-        return instance().namedMods.containsKey(modname);
+        return instance().namedMods.containsKey(modname) && instance().modController.getModState(instance.namedMods.get(modname))!=ModState.DISABLED;
     }
 
     /**
diff --git a/common/cpw/mods/fml/common/toposort/ModSorter.java b/common/cpw/mods/fml/common/toposort/ModSorter.java
index dd363e0213..a865aacfdb 100644
--- a/common/cpw/mods/fml/common/toposort/ModSorter.java
+++ b/common/cpw/mods/fml/common/toposort/ModSorter.java
@@ -19,6 +19,7 @@ import java.util.Map;
 import com.google.common.collect.Lists;
 
 import cpw.mods.fml.common.DummyModContainer;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.toposort.TopologicalSort.DirectedGraph;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
@@ -78,7 +79,8 @@ public class ModSorter
             {
                 preDepAdded = true;
 
-                if (dep.getLabel().equals("*"))
+                String modid = dep.getLabel();
+                if (modid.equals("*"))
                 {
                     // We are "after" everything
                     modGraph.addEdge(mod, afterAll);
@@ -88,8 +90,8 @@ public class ModSorter
                 else
                 {
                     modGraph.addEdge(before, mod);
-                    if (nameLookup.containsKey(dep.getLabel())) {
-                        modGraph.addEdge(nameLookup.get(dep.getLabel()), mod);
+                    if (Loader.isModLoaded(modid)) {
+                        modGraph.addEdge(nameLookup.get(modid), mod);
                     }
                 }
             }
@@ -98,7 +100,8 @@ public class ModSorter
             {
                 postDepAdded = true;
 
-                if (dep.getLabel().equals("*"))
+                String modid = dep.getLabel();
+                if (modid.equals("*"))
                 {
                     // We are "before" everything
                     modGraph.addEdge(beforeAll, mod);
@@ -108,8 +111,8 @@ public class ModSorter
                 else
                 {
                     modGraph.addEdge(mod, after);
-                    if (nameLookup.containsKey(dep.getLabel())) {
-                        modGraph.addEdge(mod, nameLookup.get(dep.getLabel()));
+                    if (Loader.isModLoaded(modid)) {
+                        modGraph.addEdge(mod, nameLookup.get(modid));
                     }
                 }
             }