diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
index 92f9eda30..8365665a9 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
@@ -514,7 +514,7 @@ public class Network implements INetwork, IRedstoneConfigurable {
         }
 
         if (tag.contains(NBT_FLUID_STORAGE_TRACKER_ID)) {
-            this.fluidStorageTrackerId = tag.getUniqueId(NBT_ITEM_STORAGE_TRACKER_ID);
+            this.fluidStorageTrackerId = tag.getUniqueId(NBT_FLUID_STORAGE_TRACKER_ID);
         } else {
             if (tag.contains(NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version
                 getFluidStorageTracker().readFromNbt(tag.getList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND));
diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
index ca701a7ef..0c10171ea 100644
--- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
+++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
@@ -285,8 +285,12 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I
         stack.getTag().putInt(GridNetworkNode.NBT_TAB_SELECTED, tabSelected);
         stack.getTag().putInt(GridNetworkNode.NBT_TAB_PAGE, tabPage);
 
-        stack.getTag().putUniqueId(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId);
-        stack.getTag().putUniqueId(PortableGrid.NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId);
+        if (itemStorageTrackerId != null) {
+            stack.getTag().putUniqueId(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId);
+        }
+        if (fluidStorageTrackerId != null) {
+            stack.getTag().putUniqueId(PortableGrid.NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId);
+        }
 
         if (enchants != null) {
             stack.getTag().put(NBT_ENCHANTMENTS, enchants);