diff --git a/core/src/main/java/co/aikar/commands/CommandHelp.java b/core/src/main/java/co/aikar/commands/CommandHelp.java
index 8cd85328..6389550f 100644
--- a/core/src/main/java/co/aikar/commands/CommandHelp.java
+++ b/core/src/main/java/co/aikar/commands/CommandHelp.java
@@ -60,8 +60,11 @@ public class CommandHelp {
         Set<RegisteredCommand> seen = new HashSet<>();
         
         if (!rootCommand.getDefCommand().hasHelpCommand) {
-            helpEntries.add(new HelpEntry(this, rootCommand.getDefaultRegisteredCommand()));
-            seen.add(rootCommand.getDefaultRegisteredCommand());
+            RegisteredCommand defCommand = rootCommand.getDefaultRegisteredCommand();
+            if (defCommand != null) {
+                helpEntries.add(new HelpEntry(this, defCommand));
+                seen.add(defCommand);
+            }
         }
         
         subCommands.entries().forEach(e -> {