From 30c1deb8cf4b4dc27ca59f3f5a56bd3aca4d0475 Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Fri, 7 Feb 2014 14:56:50 -0600
Subject: [PATCH] Fixed Crash On Startup.

---
 core/AELog.java  | 2 +-
 core/AppEng.java | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/AELog.java b/core/AELog.java
index 370efe73d..e8b57dc2c 100644
--- a/core/AELog.java
+++ b/core/AELog.java
@@ -16,7 +16,7 @@ public class AELog
 
 	private static void log(Level level, String format, Object... data)
 	{
-		if ( Configuration.instance.isFeatureEnabled( AEFeature.Logging ) )
+		if ( Configuration.instance == null || Configuration.instance.isFeatureEnabled( AEFeature.Logging ) )
 		{
 			FMLRelaunchLog.log( "AE2:" + (Platform.isServer() ? "S" : "C"), level, format, data );
 		}
diff --git a/core/AppEng.java b/core/AppEng.java
index b582e5210..73c35ce8c 100644
--- a/core/AppEng.java
+++ b/core/AppEng.java
@@ -86,7 +86,9 @@ public class AppEng
 			IntegrationSide.BOTH, "Factorization", "factorization", "FZ", // FZ
 			IntegrationSide.BOTH, "Forestry", "Forestry", "Forestry", // Forestry
 			IntegrationSide.BOTH, "Mekanism", "Mekanism", "Mekanism", // MeK
-			IntegrationSide.CLIENT, "Not Enought Items", "NotEnoughItems", "NEI", // Not Eneough Items
+			IntegrationSide.CLIENT, "Not Enought Items", "NotEnoughItems", "NEI", // Not
+																					// Eneough
+																					// Items
 			IntegrationSide.BOTH, "Forge MultiPart", "McMultipart", "FMP" } );
 
 	public boolean isIntegrationEnabled(String Name)
@@ -109,11 +111,11 @@ public class AppEng
 	@EventHandler
 	void PreInit(FMLPreInitializationEvent event)
 	{
-		AELog.info( "Starting ( PreInit )" );
-
 		Configuration.instance = new Configuration( event.getModConfigurationDirectory() );
 		FacadeConfig.instance = new FacadeConfig( event.getModConfigurationDirectory() );
 
+		AELog.info( "Starting ( PreInit )" );
+
 		if ( Platform.isClient() )
 		{
 			CreativeTab.init();