From e8c251808bb59341b8a4b8aa79d3ced26c0fdad7 Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Sat, 12 Jul 2014 12:03:34 -0400
Subject: [PATCH] Don't scan ObjectHolders if there was an error already,
 derpitude will ensure.

---
 fml/src/main/java/cpw/mods/fml/common/Loader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fml/src/main/java/cpw/mods/fml/common/Loader.java b/fml/src/main/java/cpw/mods/fml/common/Loader.java
index b54e30d84d..86c48abb79 100644
--- a/fml/src/main/java/cpw/mods/fml/common/Loader.java
+++ b/fml/src/main/java/cpw/mods/fml/common/Loader.java
@@ -504,12 +504,12 @@ public class Loader
 
     public void preinitializeMods()
     {
-        ObjectHolderRegistry.INSTANCE.findObjectHolders(discoverer.getASMTable());
         if (!modController.isInState(LoaderState.PREINITIALIZATION))
         {
             FMLLog.warning("There were errors previously. Not beginning mod initialization phase");
             return;
         }
+        ObjectHolderRegistry.INSTANCE.findObjectHolders(discoverer.getASMTable());
         modController.distributeStateMessage(LoaderState.PREINITIALIZATION, discoverer.getASMTable(), canonicalConfigDir);
         ObjectHolderRegistry.INSTANCE.applyObjectHolders();
         modController.transition(LoaderState.INITIALIZATION, false);