diff --git a/ChangeLog b/ChangeLog
index 55e0d905c..2e66e76ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-08  Robert Millan  <rmh@aybabtu.com>
+
+	* disk/raid.c (grub_raid_scan_device): Check for
+	`array->device[sb.this_disk.number]' rather than for
+	`array->device[sb.this_disk.number]->name', since the latter is not
+	garanteed to be accessible.
+
 2008-02-08  Robert Millan  <rmh@aybabtu.com>
 
 	* disk/raid.c: Update copyright.
diff --git a/disk/raid.c b/disk/raid.c
index d5da39709..8b92b3477 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -419,7 +419,7 @@ grub_raid_scan_device (const char *name)
 	  return 0;
 	}
   
-      if (array->device[sb.this_disk.number]->name != 0)
+      if (array->device[sb.this_disk.number] != NULL)
 	{
 	  /* We found multiple devices with the same number. Again,
 	     this shouldn't happen.*/