diff --git a/ChangeLog b/ChangeLog
index dcdb3a7ae..f26c62431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* font/font.c (grub_font_get_glyph_with_fallback): Avoid dereferencing
+	NULL font.
+
 2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/deviceiter.c (grub_util_iterate_devices): Skip device-mapper
diff --git a/font/font.c b/font/font.c
index 9a89cadc5..89e993146 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1029,6 +1029,8 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
       next = node->next;
 
       glyph = grub_font_get_glyph_internal (curfont, code);
+      if (glyph && !font)
+	return glyph;
       if (glyph)
 	{
 	  int d;