diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bcc1ab76f3..ca81a6c401 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-24	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1587/filesystem
+	Coverity Id 35
+	* libfs/src/rfs/rtems-rfs-shell.c: Address possible NULL dereference.
+
 2010-06-23      Chris Johns <chrisj@rtems.org>
 
 	PR 1577/filesystem
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.c b/cpukit/libfs/src/rfs/rtems-rfs-shell.c
index c192c9d0fe..a11b68cecf 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-shell.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-shell.c
@@ -738,6 +738,11 @@ rtems_shell_rfs_format (int argc, char* argv[])
     }
   }
 
+  if (!driver) {
+    printf ("error: no driver name provided\n");
+    return 1;
+  }
+
   if (rtems_rfs_format (driver, &config) < 0)
   {
     printf ("error: format of %s failed: %s\n",