diff --git a/ChangeLog b/ChangeLog
index 7be34e64c..47f12a5be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-01  Seth Goldberg <seth.goldberg@oracle.com>
+
+	* grub-core/normal/context.c (grub_env_extractor_close): Don't crash
+	if no submenu is present.
+
 2012-02-01  Aleš Nesrsta <starous@volny.cz>
 
 	CBI support.
diff --git a/grub-core/normal/context.c b/grub-core/normal/context.c
index 581316603..b85f7c61c 100644
--- a/grub-core/normal/context.c
+++ b/grub-core/normal/context.c
@@ -159,7 +159,7 @@ grub_env_extractor_close (int source)
     }
   err = grub_env_context_close ();
 
-  if (source)
+  if (source && menu)
     {
       grub_menu_t menu2;
       menu2 = grub_env_get_menu ();