diff --git a/src/cligen/command_node.cr b/src/cligen/command_node.cr
index 701b29d..ec37386 100644
--- a/src/cligen/command_node.cr
+++ b/src/cligen/command_node.cr
@@ -236,7 +236,8 @@ module CliGen
           end
 
         when MatchType::NoMatch
-          abort "ERROR : CommandNode(#{@name}).process : No command, subcommand or flag match for '#{arg.value}'"
+          puts "ERROR : CommandNode(#{@name}).process : No command, subcommand or flag match for '#{arg.value}'"
+          abort help
         end
       end
 
@@ -260,8 +261,8 @@ module CliGen
           {% if T.has_method?(:main) %}
             cls.main
           {% else %}
-            puts help
             puts "ERROR : CommandNode({{T}})\#{{@def.name}} : No subcommand matched and no #main defined"
+            puts help
           {% end %}
             exit 0
         end