diff --git a/me/Grid.java b/me/Grid.java
index b3da1d9cd..2a6065a7b 100644
--- a/me/Grid.java
+++ b/me/Grid.java
@@ -199,9 +199,13 @@ public class Grid implements IGrid
 
 	public void update()
 	{
-		for (IGridCache gc : caches.values())
+		// are ther any nodes left?
+		if ( pivot != null )
 		{
-			gc.onUpdateTick();
+			for (IGridCache gc : caches.values())
+			{
+				gc.onUpdateTick();
+			}
 		}
 	}
 
diff --git a/transformer/AppEngCore.java b/transformer/AppEngCore.java
index 562090939..e70f3b701 100644
--- a/transformer/AppEngCore.java
+++ b/transformer/AppEngCore.java
@@ -47,7 +47,7 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
 	@Override
 	public String[] getASMTransformerClass()
 	{
-		return new String[] { "appeng.transformer.asm.ASMIntegration", "appeng.transformer.asm.ASMMigration" };
+		return new String[] { "appeng.transformer.asm.ASMIntegration" };
 	}
 
 	@Override