diff --git a/datagen/src/main/java/org/geysermc/rainbow/datagen/RainbowModelProvider.java b/datagen/src/main/java/org/geysermc/rainbow/datagen/RainbowModelProvider.java
index b9042a9..0562a3c 100644
--- a/datagen/src/main/java/org/geysermc/rainbow/datagen/RainbowModelProvider.java
+++ b/datagen/src/main/java/org/geysermc/rainbow/datagen/RainbowModelProvider.java
@@ -120,7 +120,7 @@ public abstract class RainbowModelProvider extends FabricModelProvider {
                     byte[] textureBytes = inputTexture.readAllBytes();
                     output.writeIfNeeded(path, textureBytes, HashCode.fromBytes(textureBytes));
                 } catch (IOException exception) {
-                    // TODO log
+                    LOGGER.error("Failed to save file to {}", path, exception);
                 }
             }, Util.backgroundExecutor().forName("PackSerializer-saveTexture"));
         }
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
index 72c1d7b..8e1e7d9 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
@@ -264,7 +264,7 @@ public class BedrockItemMapper {
                 tags = List.of();
             }
 
-            GeyserBaseDefinition base = new GeyserBaseDefinition(bedrockIdentifier, Optional.of(stack.getHoverName().getString()), predicateStack,
+            GeyserBaseDefinition base = new GeyserBaseDefinition(bedrockIdentifier, Optional.ofNullable(stack.getHoverName().tryCollapseToString()), predicateStack,
                     new GeyserBaseDefinition.BedrockOptions(Optional.empty(), true, displayHandheld, calculateProtectionValue(stack), tags),
                     stack.getComponentsPatch());
             try {