diff --git a/ChangeLog b/ChangeLog
index 4381e3cc4..bffd6c16c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-25  Felix Zielcke  <fzielcke@z-51.de>
+
+	* kern/file.c (grub_file_open): Fix an error check.
+
 2009-07-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/i386/pc/grub-setup.c (setup): Fix segmentation fault when
diff --git a/kern/file.c b/kern/file.c
index 9b56b88e4..362cf1d7f 100644
--- a/kern/file.c
+++ b/kern/file.c
@@ -60,8 +60,8 @@ grub_file_open (const char *name)
   char *file_name;
 
   device_name = grub_file_get_device_name (name);
-  if (grub_errno)
-    return 0;
+  if (! device_name)
+    goto fail;
 
   /* Get the file part of NAME.  */
   file_name = grub_strchr (name, ')');