diff --git a/src/misc2.c b/src/misc2.c
index 4918189..5fc2040 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4356,7 +4356,10 @@
 	    int i;
 
 	    for (i = 0; i < *argc; ++i)
+	    {
 		vim_free((*argv)[i]);
+		(*argv)[i] = NULL;
+	    }
 	    return FAIL;
 	}
 	(*argv)[*argc] = (char *)vim_strsave(s);