diff --git a/core/Registration.java b/core/Registration.java
index 6737cac99..0a74a52d5 100644
--- a/core/Registration.java
+++ b/core/Registration.java
@@ -664,13 +664,20 @@ public class Registration
 
 	private void registerSpatial(boolean force)
 	{
+		if ( ! AEConfig.instance.isFeatureEnabled( AEFeature.SpatialIO ) )
+			return;
+		
 		AEConfig config = AEConfig.instance;
 
 		if ( storageBiome == null )
 		{
 			if ( force && config.storageBiomeID == -1 )
 			{
-				storageBiome = new BiomeGenStorage( config.storageBiomeID = Platform.findEmpty( BiomeGenBase.getBiomeGenArray() ) );
+				config.storageBiomeID = Platform.findEmpty( BiomeGenBase.getBiomeGenArray() );
+				if ( config.storageBiomeID == -1 )
+					throw new RuntimeException("Biome Array is full, please free up some Biome ID's or disable spatial.");
+				
+				storageBiome = new BiomeGenStorage( config.storageBiomeID );
 				config.save();
 			}
 
diff --git a/tile/storage/TileIOPort.java b/tile/storage/TileIOPort.java
index 832bdefe7..4d160af54 100644
--- a/tile/storage/TileIOPort.java
+++ b/tile/storage/TileIOPort.java
@@ -379,8 +379,12 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 								src.injectItems( failed, Actionable.MODULATE, mySrc );
 							}
 
-							itemsToMove -= possible;
-							didStuff = true;
+							if ( possible > 0 )
+							{
+								itemsToMove -= possible;
+								didStuff = true;
+							}
+							
 							break;
 						}
 					}