diff --git a/src/uifc/uifc.c b/src/uifc/uifc.c
index daece59db00d39d617da4c84ee4449707bbf6de3..10deca01a5913c4da8223a2bb96dcb481be57d31 100644
--- a/src/uifc/uifc.c
+++ b/src/uifc/uifc.c
@@ -374,7 +374,7 @@ if(mode&WIN_GET) bline|=BL_GET;
 if(mode&WIN_PUT) bline|=BL_PUT;
 bottomline(bline);
 while(opts<max_opts && opts<MAX_OPTS)
-	if(option[opts][0]==0)
+	if(option[opts]==NULL || option[opts][0]==0)
 		break;
 	else opts++;
 if(mode&WIN_XTR && opts<max_opts && opts<MAX_OPTS)
diff --git a/src/uifc/uifc32.c b/src/uifc/uifc32.c
index 5b6c5e267dff42137a2fa7cf131981f6d936906c..e0a77fffd8a52b50ef6269e6e36843aba08f8b69 100644
--- a/src/uifc/uifc32.c
+++ b/src/uifc/uifc32.c
@@ -636,7 +636,7 @@ int ulist(int mode, int left, int top, int width, int *cur, int *bar
 	if(mode&WIN_PUT) bline|=BL_PUT;
 	bottomline(bline);
 	while(opts<MAX_OPTS)
-		if(option[opts][0]==0)
+		if(option[opts]==NULL || option[opts][0]==0)
 			break;
 		else opts++;
 	if(mode&WIN_XTR && opts<MAX_OPTS)
diff --git a/src/uifc/uifcc.c b/src/uifc/uifcc.c
index 143f116a84e7ac0a0904d73b30d32c4fbaa1dc89..1f5d1b42ecc6f01065cc501f6ab10a3249d0ff61 100644
--- a/src/uifc/uifcc.c
+++ b/src/uifc/uifcc.c
@@ -422,7 +422,7 @@ int ulist(int mode, int left, int top, int width, int *cur, int *bar
 	if(mode&WIN_PUT) bline|=BL_PUT;
 	bottomline(bline);
 	while(opts<max_opts && opts<MAX_OPTS)
-		if(option[opts][0]==0)
+		if(option[opts]==NULL || option[opts][0]==0)
 			break;
 		else opts++;
 	if(mode&WIN_XTR && opts<max_opts && opts<MAX_OPTS)
diff --git a/src/uifc/uifcd.c b/src/uifc/uifcd.c
index 1ad6f95b64317e3fdbf0550973818bf5220d5507..6149f538180a25e75bcfe3df76905e95b76fd6e9 100644
--- a/src/uifc/uifcd.c
+++ b/src/uifc/uifcd.c
@@ -135,7 +135,7 @@ int ulist(int mode, int left, int top, int width, int *cur, int *bar
 
 	/* Count number of menu options */
     for(cnt=0;cnt<MAX_OPTS;cnt++)
-		if(option[cnt][0]==0)
+		if(option[cnt]==NULL || option[cnt][0]==0)
 	   		break;
 	options=cnt;
 	freecnt=cnt+5;	/* Add, Delete, Copy, Paste, At End */
diff --git a/src/uifc/uifcx.c b/src/uifc/uifcx.c
index 196299d2eef381570b95235a1db6d0ae9bb0b5be..f8bc8cd43d45bd35cd8a85d15a6b72364f0b0978 100644
--- a/src/uifc/uifcx.c
+++ b/src/uifc/uifcx.c
@@ -200,7 +200,7 @@ int ulist(int mode, int left, int top, int width, int *cur, int *bar
     int lines;
 
     for(opts=0;opts<MAX_OPTS;opts++)
-    	if(option[opts][0]==0)
+    	if(option[opts]==NULL || option[opts][0]==0)
     		break;
 
     if((*cur)>=opts)