diff --git a/ChangeLog b/ChangeLog
index 3f15bcc7b..de0a5690a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkfont.c (main): Handle errors from FT_Set_Pixel_Sizes.
+
 2010-12-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/normal/term.c (print_more): Make \r or \n scroll one
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 3e24380d1..fff6a619e 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -1170,7 +1170,8 @@ main (int argc, char *argv[])
       font_info.style = ft_face->style_flags;
       font_info.size = size;
 
-      FT_Set_Pixel_Sizes (ft_face, size, size);
+      if (FT_Set_Pixel_Sizes (ft_face, size, size))
+	grub_util_error ("can't set %dx%d font size", size, size);
       add_font (&font_info, ft_face, file_format != PF2);
       FT_Done_Face (ft_face);
     }