diff --git a/ChangeLog b/ChangeLog
index a0ae8b2a0..5553a991c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/efiemu/main.c (grub_efiemu_prepare): Handle errors from
+	grub_efiemu_autocore.
+
 2010-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/i386/pc/startup.S (bypass_table): Use 0x1b explicitly
diff --git a/grub-core/efiemu/main.c b/grub-core/efiemu/main.c
index ee78afe7d..da813b00d 100644
--- a/grub-core/efiemu/main.c
+++ b/grub-core/efiemu/main.c
@@ -266,11 +266,13 @@ grub_efiemu_prepare (void)
   if (prepared)
     return GRUB_ERR_NONE;
 
+  err = grub_efiemu_autocore ();
+  if (err)
+    return err;
+
   grub_dprintf ("efiemu", "Preparing %d-bit efiemu\n",
 		8 * grub_efiemu_sizeof_uintn_t ());
 
-  err = grub_efiemu_autocore ();
-
   /* Create NVRAM. */
   grub_efiemu_pnvram ();