diff --git a/src/memline.c b/src/memline.c
index 9284abb..e86a792 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1532,7 +1532,7 @@
 			files[i] = files[i + 1];
 		}
 	}
-	if (nr)
+	if (nr > 0)
 	{
 	    file_count += num_files;
 	    if (nr <= file_count)
@@ -1578,7 +1578,8 @@
 
 	for (i = 0; i < num_names; ++i)
 	    vim_free(names[i]);
-	FreeWild(num_files, files);
+	if (num_files > 0)
+	    FreeWild(num_files, files);
     }
     vim_free(dir_name);
     return file_count;