From 5b4de7b2b5f5ec0fe487a402110cb1f8c111a2f0 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 18 Oct 2012 14:41:32 -0400
Subject: [PATCH] Try and avoid an NPE in crash reports

---
 fml/common/cpw/mods/fml/common/Loader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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