diff --git a/ChangeLog b/ChangeLog
index 42e141472..2d1733ac3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-14  Colin Watson  <cjwatson@ubuntu.com>
+
+	* commands/test.c (get_fileinfo): Return immediately if
+	grub_fs_probe fails.
+
 2009-09-14  José Martínez  <xosemp@gmail.com>
 
 	* commands/acpi.c (grub_cmd_acpi): Fix loading ACPI tables from file.
diff --git a/commands/test.c b/commands/test.c
index 26df8b5c5..9c813c820 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -88,6 +88,13 @@ test_parse (char **args, int *argn, int argc)
       }
 
     fs = grub_fs_probe (dev);
+    if (! fs)
+      {
+	grub_free (device_name);
+	grub_device_close (dev);
+	return;
+      }
+
     pathname = grub_strchr (path, ')');
     if (! pathname)
       pathname = path;