diff --git a/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java
index bcb92bbd..e8a48d0b 100644
--- a/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java
+++ b/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java
@@ -77,6 +77,9 @@ public void complete(LineReader reader, ParsedLine line, List<Candidate> candida
                 });
             } else {
                 Command target = findCommand(line.words().get(0));
+                if(target == null) {
+                    return;
+                }
                 List<String> words = line.words();
                 List<Candidate> candidates1 = target.complete(words.subList(1, words.size()), line.wordIndex() - 1, completeWord);
                 candidates.addAll(candidates1);