diff --git a/spring-shell-core/src/main/java/org/springframework/shell/CommandNotFound.java b/spring-shell-core/src/main/java/org/springframework/shell/CommandNotFound.java
index d114e69c3..a0677d109 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/CommandNotFound.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/CommandNotFound.java
@@ -16,6 +16,7 @@
 
 package org.springframework.shell;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -34,4 +35,12 @@ public CommandNotFound(List<String> words) {
 	public String getMessage() {
 		return String.format("No command found for '%s'", words.stream().collect(Collectors.joining(" ")));
 	}
+
+	/**
+	 * return a copy of the words inputted by the user to avoid mutation
+	 * @return
+	 */
+	public List<String> getWords(){
+		return new ArrayList<>(words);
+	}
 }