diff --git a/changelog.md b/changelog.md
index 3432f6355..1ec48f5ea 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 * [#3533] Added support for observing the contents of fluid container items.
 * [#3620] Fixed OC 1.8.0+ regression involving API arguments and numbers.
 * [#3013] Fixed rare server-side deadlock when sending disk activity update packets.
+* Added Spanish translation.
 * Fixed string.gmatch not supporting the "init" argument on Lua 5.4.
 * Update GNU Unifont to 15.0.04.
 
@@ -13,4 +14,4 @@
 
 ## List of contributors
 
-asie, ds84182, Possseidon, repo-alt
+asie, ds84182, Possseidon, repo-alt, sanmofe
diff --git a/src/main/scala/li/cil/oc/integration/vanilla/ConverterFluidContainerItem.scala b/src/main/scala/li/cil/oc/integration/vanilla/ConverterFluidContainerItem.scala
index c8ecba78f..99fa17576 100644
--- a/src/main/scala/li/cil/oc/integration/vanilla/ConverterFluidContainerItem.scala
+++ b/src/main/scala/li/cil/oc/integration/vanilla/ConverterFluidContainerItem.scala
@@ -16,8 +16,12 @@ object ConverterFluidContainerItem extends api.driver.Converter {
           output += "capacity" -> Int.box(fc.getCapacity(stack))
           val fluidStack = fc.getFluid(stack)
           if (fluidStack != null) {
-            output += "fluid" -> Registry.convert(Array[AnyRef](fluidStack))(0)
-          } else {
+            val fluidData = Registry.convert(Array[AnyRef](fluidStack))
+            if (fluidData.nonEmpty) {
+              output += "fluid" -> fluidData(0)
+            }
+          }
+          if (!output.containsKey("fluid")) {
             val fluidMap = new util.HashMap[AnyRef, AnyRef]()
             fluidMap += "amount" -> Int.box(0)
             output += "fluid" -> fluidMap