diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
index 7251f03..e65e23d 100644
--- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java
+++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
@@ -89,9 +89,7 @@ public class CommandDispatcher<S> {
                 continue;
             }
 
-            if (child.getCommand() != null) {
-                context.withCommand(child.getCommand());
-            }
+            context.withCommand(child.getCommand());
             if (remaining.isEmpty()) {
                 return new ParseResults<>(context);
             } else {
diff --git a/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java b/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
index 702e239..f1defe2 100644
--- a/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
+++ b/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
@@ -49,8 +49,8 @@ public class CommandDispatcherTest {
     @SuppressWarnings("unchecked")
     @Test
     public void testCreateAndMergeCommands() throws Exception {
-        subject.register(literal("base").then(literal("foo")).executes(command));
-        subject.register(literal("base").then(literal("bar")).executes(command));
+        subject.register(literal("base").then(literal("foo").executes(command)));
+        subject.register(literal("base").then(literal("bar").executes(command)));
 
         assertThat(subject.execute("base foo", source), is(42));
         assertThat(subject.execute("base bar", source), is(42));