diff --git a/ChangeLog b/ChangeLog
index de222d1cb..5fd6a7c0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/multiboot_mbi.c (grub_multiboot_load): Correctly report
+	unsupported video mode types.
+
 2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/pc/startup.S (grub_getrtsecs): Removed (dead code).
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 2a7c70f96..3d974f04e 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -170,6 +170,11 @@ grub_multiboot_load (grub_file_t file)
 					    header->width, header->height,
 					    header->depth, 0);
 	  break;
+	default:
+	  err = grub_error (GRUB_ERR_BAD_OS, 
+			    "unsupported graphical mode type %d",
+			    header->mode_type);
+	  break;
 	}
     }
   else