diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java index 2a1036833e..ff53b2932b 100644 --- a/common/cpw/mods/fml/common/Loader.java +++ b/common/cpw/mods/fml/common/Loader.java @@ -427,7 +427,7 @@ public class Loader public List getModList() { - return ImmutableList.copyOf(instance().mods); + return instance().mods != null ? ImmutableList.copyOf(instance().mods) : ImmutableList.of(); } /** @@ -663,7 +663,7 @@ public class Loader public List getActiveModList() { - return modController.getActiveModList(); + return modController != null ? modController.getActiveModList() : ImmutableList.of(); } public ModState getModState(ModContainer selectedMod)