--- freem/src/fmadm.c	2025/05/13 20:03:53	1.42
+++ freem/src/fmadm.c	2026/03/24 00:25:36	1.43
@@ -1,5 +1,5 @@
 /*
- *   $Id: fmadm.c,v 1.42 2025/05/13 20:03:53 snw Exp $
+ *   $Id: fmadm.c,v 1.43 2026/03/24 00:25:36 snw Exp $
  *    FreeM Administration Tool
  *
  *  
@@ -24,6 +24,9 @@
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
  *   $Log: fmadm.c,v $
+ *   Revision 1.43  2026/03/24 00:25:36  snw
+ *   Fix segfault when running \'fmadm status\' without a second argument
+ *
  *   Revision 1.42  2025/05/13 20:03:53  snw
  *   Error-check fopen in fm_daemonctl
  *
@@ -433,10 +436,21 @@ int main (int argc, char **argv)
             obj = OBJ_DAEMON;
             goto process_args;
         }
-        else if (strcmp (argv[1], "status") == 0  && strcmp (argv[2], "environment") == 0) {
-            act = ACT_STATUS;
-            obj = OBJ_DAEMON;
-            goto process_args;
+        else if (strcmp (argv[1], "status") == 0) {
+            if (argc < 3) {
+                fprintf (stderr, "fmadm:  did you mean 'fmadm status environment'?\r\n");               
+                exit (1);
+            }
+
+            if (strcmp (argv[2], "environment") == 0) {
+                act = ACT_STATUS;
+                obj = OBJ_DAEMON;
+                goto process_args;
+            }
+            else {
+                fmadm_usage ();
+                exit (1);
+            }
         }        
 
     }