diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b900e1..7528c62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [0.2.1] - 2025-11-22
+
+### Fixed
+- Thor::UndefinedCommandError raised with incorrect number of arguments (now passes command, nil, and all_commands.keys)
+
 ## [0.2.0] - 2025-11-22
 
 ### Added
@@ -38,7 +43,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - TTY::Prompt select/multi_select displaying duplicate options (switched from array pairs to hash format)
 - Default value selection not working correctly (now uses 1-based index as expected by TTY::Prompt)
 - Bundle install post-action incorrectly prompting when user explicitly skips bundle install
-- CLI error handling improved (Thor::UndefinedCommandError)
 
 ### Removed
 - Plain text summary formatting replaced with styled box display
diff --git a/Gemfile.lock b/Gemfile.lock
index 7801fb3..786ea0f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    railstart (0.2.0)
+    railstart (0.2.1)
       thor
       tty-box
       tty-prompt
diff --git a/lib/railstart/cli.rb b/lib/railstart/cli.rb
index f509d8c..6981983 100644
--- a/lib/railstart/cli.rb
+++ b/lib/railstart/cli.rb
@@ -71,7 +71,7 @@ def help(command = nil, subcommand = false)
           self.class.subcommand_classes[command].help(shell, subcommand)
         else
           cmd = self.class.all_commands[command]
-          raise Thor::UndefinedCommandError, "Could not find command '#{command}'." unless cmd
+          raise Thor::UndefinedCommandError.new(command, nil, self.class.all_commands.keys) unless cmd
 
           shell.say "Usage:"
           shell.say "  #{self.class.banner(cmd)}"
diff --git a/lib/railstart/version.rb b/lib/railstart/version.rb
index 81b70f7..f316619 100644
--- a/lib/railstart/version.rb
+++ b/lib/railstart/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Railstart
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end