diff --git a/build.gradle b/build.gradle
index c739bc1a..2ab2299f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
 apply plugin: 'maven' // for uploading to a maven repo
 apply plugin: 'checkstyle'
 
-version = "6.4.8"
+version = "6.4.9"
 group= "com.mod-buildcraft"
 archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
 
diff --git a/buildcraft_resources/changelog/6.4.9 b/buildcraft_resources/changelog/6.4.9
new file mode 100644
index 00000000..26025596
--- /dev/null
+++ b/buildcraft_resources/changelog/6.4.9
@@ -0,0 +1,3 @@
+Bugfixes:
+[#2621] FluidStack crash with Forge 1355+ (asie)
+Crash on invalid mapping - instead reports error to console (asie)
diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt
index acbd65eb..636d8299 100755
--- a/buildcraft_resources/versions.txt
+++ b/buildcraft_resources/versions.txt
@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:6.4.8
+1.7.10:BuildCraft:6.4.9
diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java
index c5ae2cec..d7301db6 100644
--- a/common/buildcraft/transport/PipeTransportFluids.java
+++ b/common/buildcraft/transport/PipeTransportFluids.java
@@ -13,7 +13,6 @@ import java.util.BitSet;
 import java.util.HashMap;
 import java.util.Map;
 
-import buildcraft.transport.utils.FluidRenderData;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 
@@ -43,6 +42,7 @@ import buildcraft.transport.pipes.PipeFluidsStone;
 import buildcraft.transport.pipes.PipeFluidsVoid;
 import buildcraft.transport.pipes.PipeFluidsWood;
 import buildcraft.transport.pipes.events.PipeEventFluid;
+import buildcraft.transport.utils.FluidRenderData;
 
 public class PipeTransportFluids extends PipeTransport implements IFluidHandler {
     public static final Map<Class<? extends Pipe<?>>, Integer> fluidCapacities = new HashMap<Class<? extends Pipe<?>>, Integer>();
diff --git a/common/buildcraft/transport/network/PacketFluidUpdate.java b/common/buildcraft/transport/network/PacketFluidUpdate.java
index 501440a7..17f3b26e 100644
--- a/common/buildcraft/transport/network/PacketFluidUpdate.java
+++ b/common/buildcraft/transport/network/PacketFluidUpdate.java
@@ -10,16 +10,12 @@ package buildcraft.transport.network;
 
 import java.util.BitSet;
 
-import buildcraft.transport.utils.FluidRenderData;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
 
 import buildcraft.core.network.PacketCoordinates;
 import buildcraft.core.network.PacketIds;
@@ -27,6 +23,7 @@ import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.BitSetUtils;
 import buildcraft.transport.PipeTransportFluids;
 import buildcraft.transport.TileGenericPipe;
+import buildcraft.transport.utils.FluidRenderData;
 
 public class PacketFluidUpdate extends PacketCoordinates {
 
diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java
index 8f140ded..f257b0e0 100644
--- a/common/buildcraft/transport/render/PipeRendererTESR.java
+++ b/common/buildcraft/transport/render/PipeRendererTESR.java
@@ -10,7 +10,6 @@ package buildcraft.transport.render;
 
 import java.util.HashMap;
 
-import buildcraft.transport.utils.FluidRenderData;
 import com.google.common.collect.Maps;
 
 import org.lwjgl.opengl.GL11;
@@ -56,6 +55,7 @@ import buildcraft.transport.PipeTransportPower;
 import buildcraft.transport.TileGenericPipe;
 import buildcraft.transport.TravelingItem;
 import buildcraft.transport.gates.GatePluggable;
+import buildcraft.transport.utils.FluidRenderData;
 
 public class PipeRendererTESR extends TileEntitySpecialRenderer {
 	public static final float DISPLAY_MULTIPLIER = 0.1f;