diff --git a/common/name-value.c b/common/name-value.c
index 103c35d1c..d1d0a3f6f 100644
--- a/common/name-value.c
+++ b/common/name-value.c
@@ -538,21 +538,32 @@ nve_t
 nvc_first (nvc_t pk)
 {
   nve_t entry;
+
+  if (!pk)
+    return NULL;
+
   for (entry = pk->first; entry; entry = entry->next)
     if (entry->name)
       return entry;
+
   return NULL;
 }
 
 
-/* Get the first entry with the given name.  */
+/* Get the first entry with the given name.  Return NULL if it does
+ * not exist.  */
 nve_t
 nvc_lookup (nvc_t pk, const char *name)
 {
   nve_t entry;
+
+  if (!pk)
+    return NULL;
+
   for (entry = pk->first; entry; entry = entry->next)
     if (entry->name && ascii_strcasecmp (entry->name, name) == 0)
       return entry;
+
   return NULL;
 }