diff --git a/ChangeLog b/ChangeLog
index 83afffca3..d4da9f96c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-03  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* script/execute.c (grub_script_execute_cmdline): Check for NULL
+	as command name case.
+
 2010-08-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/raid.c (insert_array): Select unique numbers for named arrays
diff --git a/script/execute.c b/script/execute.c
index 40f161267..c45a15d29 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -207,7 +207,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 
   /* Lookup the command.  */
   args = grub_script_execute_arglist_to_argv (cmdline->arglist, &argcount);
-  if (!args)
+  if (! args || ! args[0])
     return grub_errno;
 
   cmdname = args[0];