diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h
index d09c51aed..958ab1d1a 100644
--- a/include/hamlib/riglist.h
+++ b/include/hamlib/riglist.h
@@ -26,6 +26,8 @@
 //! @cond Doxygen_Suppress
 
 // The rig model number is designed to fit in a 32-bit int
+// As of 2024-07-14 we have 39 backends defined -- need to be careful about generating new ones
+// Perhaps combine them under a MISC entry should work
 // As of 2020-02-18 we have 33 backends defined
 // With a max of 1000 models per backend we get total a model number range of 1001-33001
 // This MAX was 100 prior to 2020-02-18 and Icom was close to running out of the 100 range
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index e90074cb1..6361380f3 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -2090,6 +2090,7 @@ void print_model_list()
 
     for (s = models; s != NULL; s = (struct mod_lst *)(s->hh.next))
     {
+
         printf("%6d  %-23s%-24s%-16s%-12s%s\n",
                s->id,
                s->mfg_name,
@@ -2097,6 +2098,20 @@ void print_model_list()
                s->version,
                s->macro_name,
                s->status);
+
+        if (strcmp(s->mfg_name,"Misc") == 0
+         || strcmp(s->mfg_name,"Other") == 0
+         || strcmp(s->mfg_name,"Dummy") == 0)
+        {
+            printf("Do not use %s as mfg_name\n", s->mfg_name);
+            exit(0);
+        }
+        if (strcmp(s->model_name,"Misc") == 0
+         || strcmp(s->model_name,"Other") == 0)
+        {
+            printf("Do not use %s as model_name\n", s->model_name);
+            exit(0);
+        }
     }
 }