diff --git a/cli.php b/cli.php
index 427fa50..13f54d7 100644
--- a/cli.php
+++ b/cli.php
@@ -102,9 +102,17 @@ class cli
     if ($this->EXPERT)
       $files = array_merge ($files, glob ("models/*.php"));
     if (count ($files) === 0 && $this->EXPERT === FALSE)
+    {
+      if (isset ($argv[0]) && $argv[0] === "-listonly")
+        exit;
       die ("No controllers available in ".getcwd()."\n");
+    }
     if (count ($files) === 0 && $this->EXPERT === TRUE)
+    {
+      if (isset ($argv[0]) && $argv[0] === "-listonly")
+        exit;
       die ("No controllers/models available in ".getcwd()."\n");
+    }
     foreach ($files as $file)
     {
       if (strpos ($file, "_"))