diff --git a/src/edit.c b/src/edit.c
index a43891f..b24c514 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2146,11 +2146,11 @@
     else
 	match->cp_fname = NULL;
     match->cp_flags = flags;
-    if (kind != NULL)
+    if (kind != NULL && *kind != NUL)
 	match->cp_kind = vim_strsave(kind);
-    if (extra != NULL)
+    if (extra != NULL && *extra != NUL)
 	match->cp_extra = vim_strsave(extra);
-    if (info != NULL)
+    if (info != NULL && *info != NUL)
 	match->cp_info = vim_strsave(info);
 
     /*