diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
index a9498f937..6f2984c5d 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
@@ -170,7 +170,7 @@ public class CommandRewriter {
      * @return new argument type, or null if it should be removed
      */
     public @Nullable String handleArgumentType(String argumentType) {
-        if (protocol.getMappingData().getArgumentTypeMappings() != null) {
+        if (protocol.getMappingData() != null && protocol.getMappingData().getArgumentTypeMappings() != null) {
             return protocol.getMappingData().getArgumentTypeMappings().mappedIdentifier(argumentType);
         }
         return argumentType;