diff --git a/src/main/java/refinedstorage/network/MessageTileDataParameter.java b/src/main/java/refinedstorage/network/MessageTileDataParameter.java
index c57daa17f..723f9968d 100755
--- a/src/main/java/refinedstorage/network/MessageTileDataParameter.java
+++ b/src/main/java/refinedstorage/network/MessageTileDataParameter.java
@@ -9,8 +9,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.tile.data.TileDataManager;
 import refinedstorage.tile.data.TileDataParameter;
 
-import java.io.IOException;
-
 public class MessageTileDataParameter implements IMessage, IMessageHandler<MessageTileDataParameter, IMessage> {
     private TileEntity tile;
     private TileDataParameter parameter;
@@ -32,7 +30,8 @@ public class MessageTileDataParameter implements IMessage, IMessageHandler<Messa
         if (parameter != null) {
             try {
                 parameter.setValue(parameter.getSerializer().read(new PacketBuffer(buf)));
-            } catch (IOException ignored) {
+            } catch (Exception e) {
+                // NO OP
             }
         }
     }
diff --git a/src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java b/src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java
index 42e898122..90170c864 100755
--- a/src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java
+++ b/src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java
@@ -128,7 +128,7 @@ public final class RefinedStorageSerializers {
                 return new FluidStack(FluidRegistry.getFluid(ByteBufUtils.readUTF8String(buf)), buf.readInt(), buf.readNBTTagCompoundFromBuffer());
             }
 
-            return null;
+            throw new IOException("No fluid");
         }
 
         @Override