diff --git a/ChangeLog b/ChangeLog
index 050ce284d..a613c6369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-02  Pavel Roskin  <proski@gnu.org>
 
+	* util/grub-editenv.c (main): Be specific which parameter is
+	missing.
+
 	* disk/memdisk.c (memdisk_addr): Make a pointer to fix warnings.
 	(memdisk): Make memdisk_orig_addr a pointer.
 
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 3d06adf50..031b32633 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -226,9 +226,15 @@ main (int argc, char *argv[])
     }
 
   /* Obtain PATH.  */
+  if (optind >= argc)
+    {
+      fprintf (stderr, "Filename not specified.\n");
+      usage (1);
+    }
+
   if (optind + 1 >= argc)
     {
-      fprintf (stderr, "Not enough parameter.\n");
+      fprintf (stderr, "Command not specified.\n");
       usage (1);
     }