diff --git a/lib/chibi/app.scm b/lib/chibi/app.scm
index 1ba222b8..315662f6 100644
--- a/lib/chibi/app.scm
+++ b/lib/chibi/app.scm
@@ -276,5 +276,8 @@
              (if init (init cfg))
              (apply proc cfg spec args)
              (if end (end cfg)))))
+     ((null? (cdr args))
+      (apply app-help-command config spec args)
+      (error "Expected a command"))
      (else
-      (error "Unknown command: " args)))))
+      (error "Unknown command: " (cdr args))))))