diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java
index e3de626c2..97160250d 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java
@@ -32,6 +32,7 @@ import org.geysermc.connector.network.translators.Translator;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityMetadataPacket;
+import org.geysermc.connector.utils.LanguageUtils;
 
 @Translator(packet = ServerEntityMetadataPacket.class)
 public class JavaEntityMetadataTranslator extends PacketTranslator<ServerEntityMetadataPacket> {
@@ -45,7 +46,18 @@ public class JavaEntityMetadataTranslator extends PacketTranslator<ServerEntityM
         if (entity == null) return;
 
         for (EntityMetadata metadata : packet.getMetadata()) {
-            entity.updateBedrockMetadata(metadata, session);
+            try {
+                entity.updateBedrockMetadata(metadata, session);
+            } catch (ClassCastException e) {
+                // Class cast exceptions are really the only ones we're going to get in normal gameplay
+                // Because some entity rewriters forget about some values
+                // Any other errors are actual bugs
+                session.getConnector().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.translator.metadata.failed", metadata, entity.getEntityType()));
+                session.getConnector().getLogger().debug("Entity Java ID: " + entity.getEntityId() + ", Geyser ID: " + entity.getGeyserId());
+                if (session.getConnector().getConfig().isDebugMode()) {
+                    e.printStackTrace();
+                }
+            }
         }
 
         entity.updateBedrockMetadata(session);
diff --git a/connector/src/main/resources/languages b/connector/src/main/resources/languages
index 65e36478b..7cc503e2f 160000
--- a/connector/src/main/resources/languages
+++ b/connector/src/main/resources/languages
@@ -1 +1 @@
-Subproject commit 65e36478b894af9cec74bc6df6552cb160a0c47d
+Subproject commit 7cc503e2f7c0871a24beb3a114726d764a4836f1