diff --git a/ChangeLog b/ChangeLog
index f316af0b1..bb4d0aade 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+2011-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/font/font_cmd.c (loadfont_command): Set grub_errno
+	on error if not already done.
+
 2011-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix few potential memory misusage.
 
 	* grub-core/font/font.c (load_font_index): Don't free char_index to
 	avoid double free.
+	(grub_font_load): Zero-fill font at alloc for safety.
+	Close file on error.
+	(free_font): Free bmp_idx.
 
 2011-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/grub-core/font/font_cmd.c b/grub-core/font/font_cmd.c
index 8b00dd8b9..98f0b88d6 100644
--- a/grub-core/font/font_cmd.c
+++ b/grub-core/font/font_cmd.c
@@ -33,7 +33,11 @@ loadfont_command (grub_command_t cmd __attribute__ ((unused)),
 
   while (argc--)
     if (grub_font_load (*args++) != 0)
-      return GRUB_ERR_BAD_FONT;
+      {
+	if (!grub_errno)
+	  return grub_error (GRUB_ERR_BAD_FONT, "invalid font");
+	return grub_errno;
+      }
 
   return GRUB_ERR_NONE;
 }