diff --git a/lib/gli/command_support.rb b/lib/gli/command_support.rb
index ba8755d..b6edb93 100644
--- a/lib/gli/command_support.rb
+++ b/lib/gli/command_support.rb
@@ -166,12 +166,8 @@ def get_action(arguments)
 
     def generate_error_action(arguments)
       lambda { |global_options,options,arguments|
-        if am_subcommand?
-          if arguments.size > 0
-            raise UnknownCommand,"Unknown command '#{arguments[0]}'"
-          else
-            raise BadCommandLine,"Command '#{name}' requires a subcommand"
-          end
+        if am_subcommand? && arguments.size > 0
+          raise UnknownCommand,"Unknown command '#{arguments[0]}'"
         elsif have_subcommands?
           raise BadCommandLine,"Command '#{name}' requires a subcommand #{self.commands.keys.join(',')}"
         else