diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index d8df13c..b16ba56 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3739,7 +3739,7 @@
     if (depth > 10)
 	return FALSE;
 
-    for (;;)
+    while (state != NULL)
     {
 	switch (state->c)
 	{
@@ -3765,7 +3765,7 @@
 	    case NFA_COMPOSING:
 		/* skip ahead to next state */
 		state = state->out1->out;
-		break;
+		continue;
 
 	    case NFA_ANY:
 	    case NFA_IDENT: