diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9e6dc85..64fa851 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-12 Paul Jakma <paul.jakma@sun.com>
+
+	* plist.c: (vty_prefix_list_uninstall) Fix potential NULL deref
+	  of prefix and typestr strings, Coverity CID #3.
+
 2006-03-30 Paul Jakma <paul.jakma@sun.com>
 
 	* command.h: (DEFUN_CMD_FUNC_TEXT) Annotate arguments as
diff --git a/lib/plist.c b/lib/plist.c
index 83c5aa0..6caece0 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -804,6 +804,13 @@
       return CMD_SUCCESS;
     }
 
+  /* We must have, at a minimum, both the type and prefix here */
+  if ((typestr == NULL) || (prefix == NULL))
+    {
+      vty_out (vty, "%% Both prefix and type required%s", VTY_NEWLINE);
+      return CMD_WARNING;
+    }
+
   /* Check sequence number. */
   if (seq)
     seqnum = atoi (seq);