diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c
index 50cd0c2da..f1ff6ef42 100644
--- a/src/spicelib/parser/inp2q.c
+++ b/src/spicelib/parser/inp2q.c
@@ -78,16 +78,13 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
             current->error = INPgetMod(ckt, model, &thismodel, tab);
             break;
         }
-        if (i >= max_i)
-            break;
+        if (i >= max_i) {
+            LITERR ("could not find a valid modelname");
+            return;
+        }
         INPtermInsert(ckt, &nname[i], tab, &node[i]);
     }
 
-    if (!model) {
-        LITERR ("could not find a valid modelname");
-        return;
-    }
-
     if (i == 3) {
         /* 3-terminal device - substrate to ground */
         node[3] = gnode;