diff --git a/me/cache/TickManagerCache.java b/me/cache/TickManagerCache.java
index 758d2fa13..cc271ab9e 100644
--- a/me/cache/TickManagerCache.java
+++ b/me/cache/TickManagerCache.java
@@ -107,7 +107,9 @@ public class TickManagerCache implements ITickManager
 	{
 		TickTracker tt = alertable.get( node );
 		if ( tt == null )
-			throw new RuntimeException( "Invalid Alertted device, this node is not marked as alertable, or part of this grid." );
+			return false;
+		// throw new RuntimeException(
+		// "Invalid Alertted device, this node is not marked as alertable, or part of this grid." );
 
 		// set to awake, this is for sanity.
 		sleeping.remove( node );
diff --git a/parts/automation/PartAnnihilationPlane.java b/parts/automation/PartAnnihilationPlane.java
index ebf8c8ac2..5b94ac2ea 100644
--- a/parts/automation/PartAnnihilationPlane.java
+++ b/parts/automation/PartAnnihilationPlane.java
@@ -350,7 +350,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
 				break;
 			}
 
-			if ( capture && Platform.isServer() )
+			if ( capture && Platform.isServer() && proxy.isActive() )
 			{
 				IAEItemStack stack = AEItemStack.create( ((EntityItem) entity).getEntityItem() );
 				if ( stack != null )