diff --git a/src/main/java/seedu/todo/controllers/concerns/Disambiguator.java b/src/main/java/seedu/todo/controllers/concerns/Disambiguator.java
index 132efa2f21d4..23fb79d61355 100644
--- a/src/main/java/seedu/todo/controllers/concerns/Disambiguator.java
+++ b/src/main/java/seedu/todo/controllers/concerns/Disambiguator.java
@@ -70,10 +70,10 @@ private static String extractKeyOrValue(Map<String, String[]> parsedResult, bool
     public static String getUnknownTokenString(Map<String, String[]> parsedResult) {
         String[] defaultToken = parsedResult.get("default");
         
-        if (defaultToken == null || defaultToken.length < 2 || defaultToken[1].length() <= 0) {
+        if (defaultToken != null && defaultToken[1] != null && defaultToken[1].length() > 0) {
+            return defaultToken[1];
+        } else {
             return null;
         }
-        
-        return defaultToken[1];
     }
 }