diff --git a/ChangeLog b/ChangeLog
index 586cc1dc8..1288cfe1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-10  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/main.c (grub_load_normal_mode): Do not reset `grub_errno'.  Call
+	grub_print_error() instead.  This will let user know why we're entering
+	rescue mode.
+	Based on suggestions from Sam Morris.
+
 2008-02-10  Alexandre Boeglin  <alex@boeglin.org>
 
 	* normal/arg.c (grub_arg_parse): If one of the args is "--", call add_arg()
diff --git a/kern/main.c b/kern/main.c
index 2ecccc21a..09de03ade 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -102,8 +102,8 @@ grub_load_normal_mode (void)
   /* Load the module.  */
   grub_dl_load ("normal");
   
-  /* Ignore any error, because we have the rescue mode anyway.  */
-  grub_errno = GRUB_ERR_NONE;
+  /* Something went wrong.  Print errors here to let user know why we're entering rescue mode.  */
+  grub_print_error ();
 }
 
 /* The main routine.  */