diff --git a/ChangeLog b/ChangeLog
index 2eb0c0fcd..5069e5651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/menu.c (grub_menu_execute_entry): Fix NULL
+	dereference.
+
 2011-07-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/pata.c (grub_pata_readwrite): Add missing wait.
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index 5844cb2f0..2c127794b 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -232,7 +232,8 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
       grub_env_export ("chosen");
       grub_free (buf);
     }
-  for (ptr = def; *ptr; ptr++)
+
+  for (ptr = def; ptr && *ptr; ptr++)
     {
       if (ptr[0] == '>' && ptr[1] == '>')
 	{
@@ -242,10 +243,12 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
       if (ptr[0] == '>')
 	break;
     }
-  if (ptr[0] && ptr[1])
+
+  if (ptr && ptr[0] && ptr[1])
     grub_env_set ("default", ptr + 1);
   else
     grub_env_unset ("default");
+
   grub_script_execute_sourcecode (entry->sourcecode, entry->argc, entry->args);
 
   if (errs_before != grub_err_printed_errors)