diff --git a/core/AppEng.java b/core/AppEng.java
index a8c7df04..27348252 100644
--- a/core/AppEng.java
+++ b/core/AppEng.java
@@ -80,8 +80,7 @@ public class AppEng
 			IMCHandlers.put( "add-p2p-attunement-" + type.name().replace( '_', '-' ).toLowerCase(), new IMCP2PAttunement() );
 		}
 
-		for (CrashInfo ci : CrashInfo.values())
-			FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( ci ) );
+		FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( CrashInfo.MOD_VERSION ) );
 	}
 
 	public boolean isIntegrationEnabled(String Name)
@@ -157,6 +156,7 @@ public class AppEng
 
 		Registration.instance.PostInit( event );
 		IntegrationRegistry.instance.postinit();
+		FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( CrashInfo.INTEGRATION ) );
 
 		CommonHelper.proxy.postinit();
 		AEConfig.instance.save();
diff --git a/core/crash/CrashEnhancement.java b/core/crash/CrashEnhancement.java
index 13e41649..864162d3 100644
--- a/core/crash/CrashEnhancement.java
+++ b/core/crash/CrashEnhancement.java
@@ -9,8 +9,21 @@ public class CrashEnhancement implements ICrashCallable
 
 	final CrashInfo Output;
 
+	final String ModVersion = AEConfig.CHANNEL + " " + AEConfig.VERSION + " for Forge " + // WHAT?
+			net.minecraftforge.common.ForgeVersion.majorVersion + "." // majorVersion
+			+ net.minecraftforge.common.ForgeVersion.minorVersion + "." // minorVersion
+			+ net.minecraftforge.common.ForgeVersion.revisionVersion + "." // revisionVersion
+			+ net.minecraftforge.common.ForgeVersion.buildVersion;
+
+	final String IntegrationInfo;
+
 	public CrashEnhancement(CrashInfo ci) {
 		Output = ci;
+
+		if ( IntegrationRegistry.instance != null )
+			IntegrationInfo = IntegrationRegistry.instance.getStatus();
+		else
+			IntegrationInfo = "N/A";
 	}
 
 	@Override
@@ -19,15 +32,9 @@ public class CrashEnhancement implements ICrashCallable
 		switch (Output)
 		{
 		case MOD_VERSION:
-			return AEConfig.CHANNEL + " " + AEConfig.VERSION + " for Forge "
-					+ net.minecraftforge.common.ForgeVersion.majorVersion + "." // majorVersion
-					+ net.minecraftforge.common.ForgeVersion.minorVersion + "." // minorVersion
-					+ net.minecraftforge.common.ForgeVersion.revisionVersion + "." // revisionVersion
-					+ net.minecraftforge.common.ForgeVersion.buildVersion;
+			return ModVersion;
 		case INTEGRATION:
-			if ( IntegrationRegistry.instance == null )
-				return "N/A";
-			return IntegrationRegistry.instance.getStatus();
+			return IntegrationInfo;
 		}
 
 		return "UNKNOWN_VALUE";