diff --git a/src/quickfix.c b/src/quickfix.c
index c2ff55a..00762bd 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -532,7 +532,8 @@
 		else if (tv->v_type == VAR_LIST)
 		{
 		    /* Get the next line from the supplied list */
-		    while (p_li && p_li->li_tv.v_type != VAR_STRING)
+		    while (p_li && (p_li->li_tv.v_type != VAR_STRING
+				|| p_li->li_tv.vval.v_string == NULL))
 			p_li = p_li->li_next;	/* Skip non-string items */
 
 		    if (!p_li)			/* End of the list */