diff --git a/ChangeLog b/ChangeLog
index ee71dff37..272264165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/normal/menu_entry.c (run): Make sure we always return
+	a value.
+
 2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/commands/efi/lsefimmap.c (grub_cmd_lsefimmap):
diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
index 096600e09..6cadf81ba 100644
--- a/grub-core/normal/menu_entry.c
+++ b/grub-core/normal/menu_entry.c
@@ -1207,7 +1207,7 @@ run (struct screen *screen)
       grub_env_context_open ();
       menu = grub_zalloc (sizeof (*menu));
       if (! menu)
-	return;
+	return 0;
       grub_env_set_menu (menu);
     }