diff --git a/gradle.properties b/gradle.properties
index 89f5558f2a1..efc470ea43b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=38-GTNH
+aebuild=39-GTNH
 #KEEP V6 FOR MOD SUPPORT
 aegroup=appeng
 aebasename=appliedenergistics2
diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
index 5ac71d129fc..d30a214d091 100644
--- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
+++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
@@ -133,6 +133,8 @@ public void detectAndSendChanges()
 		{
 			return;
 		}
+		if (getGrid() == null)
+			return;
 
 		final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
 		final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
@@ -291,6 +293,8 @@ public void detectAndSendChanges()
 	private IGrid getGrid()
 	{
 		final IActionHost h = ( (IActionHost) this.getTarget() );
+		if (h == null || h.getActionableNode() == null)
+			return null;
 		return h.getActionableNode().getGrid();
 	}
 
@@ -348,7 +352,7 @@ public void startJob()
 			originalGui = GuiBridge.GUI_PATTERN_TERMINAL_EX;
 		}
 
-		if( this.result != null && !this.isSimulation() )
+		if( this.result != null && !this.isSimulation() && getGrid() != null)
 		{
 			final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
 			final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() );