diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java
index 97699dc83..b25bf2648 100644
--- a/src/main/java/appeng/core/AppEng.java
+++ b/src/main/java/appeng/core/AppEng.java
@@ -37,8 +37,9 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 
 import com.google.common.base.Stopwatch;
 
-import appeng.core.crash.CrashEnhancement;
 import appeng.core.crash.CrashInfo;
+import appeng.core.crash.IntegrationCrashEnhancement;
+import appeng.core.crash.ModCrashEnhancement;
 import appeng.core.features.AEFeature;
 import appeng.core.sync.GuiBridge;
 import appeng.core.sync.network.NetworkHandler;
@@ -79,7 +80,7 @@ public class AppEng
 
 		this.imcHandler = new IMCHandler();
 
-		FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( CrashInfo.MOD_VERSION ) );
+		FMLCommonHandler.instance().registerCrashCallable( new ModCrashEnhancement( CrashInfo.MOD_VERSION ) );
 	}
 
 	public final File getConfigDirectory()
@@ -167,7 +168,7 @@ public class AppEng
 
 		Registration.INSTANCE.postInit( event );
 		IntegrationRegistry.INSTANCE.postInit();
-		FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( CrashInfo.INTEGRATION ) );
+		FMLCommonHandler.instance().registerCrashCallable( new IntegrationCrashEnhancement() );
 
 		CommonHelper.proxy.postInit();
 		AEConfig.instance.save();
diff --git a/src/main/java/appeng/core/crash/CrashEnhancement.java b/src/main/java/appeng/core/crash/BaseCrashEnhancement.java
similarity index 51%
rename from src/main/java/appeng/core/crash/CrashEnhancement.java
rename to src/main/java/appeng/core/crash/BaseCrashEnhancement.java
index 56bb8e210..905e3c3b4 100644
--- a/src/main/java/appeng/core/crash/CrashEnhancement.java
+++ b/src/main/java/appeng/core/crash/BaseCrashEnhancement.java
@@ -21,52 +21,27 @@ package appeng.core.crash;
 
 import cpw.mods.fml.common.ICrashCallable;
 
-import appeng.core.AEConfig;
-import appeng.integration.IntegrationRegistry;
 
-
-public class CrashEnhancement implements ICrashCallable
+abstract class BaseCrashEnhancement implements ICrashCallable
 {
-
 	private final String name;
 	private final String value;
 
-	private 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;
-
-	public CrashEnhancement( CrashInfo Output )
+	public BaseCrashEnhancement( String name, String value )
 	{
-
-		if ( Output == CrashInfo.MOD_VERSION )
-		{
-			this.name = "AE2 Version";
-			this.value = this.ModVersion;
-		}
-		else if ( Output == CrashInfo.INTEGRATION )
-		{
-			this.name = "AE2 Integration";
-			this.value = IntegrationRegistry.INSTANCE.getStatus();
-		}
-		else
-		{
-			this.name = "AE2_UNKNOWN";
-			this.value = "UNKNOWN_VALUE";
-		}
+		this.name = name;
+		this.value = value;
 	}
 
 	@Override
-	public String call() throws Exception
+	public final String call() throws Exception
 	{
 		return this.value;
 	}
 
 	@Override
-	public String getLabel()
+	public final String getLabel()
 	{
 		return this.name;
 	}
-
 }
diff --git a/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java b/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java
new file mode 100644
index 000000000..72cbde527
--- /dev/null
+++ b/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java
@@ -0,0 +1,13 @@
+package appeng.core.crash;
+
+
+import appeng.integration.IntegrationRegistry;
+
+
+public class IntegrationCrashEnhancement extends BaseCrashEnhancement
+{
+	public IntegrationCrashEnhancement()
+	{
+		super( "AE2 Integration", IntegrationRegistry.INSTANCE.getStatus() );
+	}
+}
diff --git a/src/main/java/appeng/core/crash/ModCrashEnhancement.java b/src/main/java/appeng/core/crash/ModCrashEnhancement.java
new file mode 100644
index 000000000..951d8ad2e
--- /dev/null
+++ b/src/main/java/appeng/core/crash/ModCrashEnhancement.java
@@ -0,0 +1,19 @@
+package appeng.core.crash;
+
+
+import appeng.core.AEConfig;
+
+
+public class ModCrashEnhancement extends BaseCrashEnhancement
+{
+	private static final String MOD_VERSION = 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;
+
+	public ModCrashEnhancement( CrashInfo output )
+	{
+		super( "AE2 Version", MOD_VERSION );
+	}
+}