--- ./hald/linux/blockdev.c.orig	2009-09-22 21:54:44.179999843 -0600
+++ ./hald/linux/blockdev.c	2009-09-22 22:04:51.800059928 -0600
@@ -1394,7 +1394,7 @@
 		hal_device_property_set_bool (d, "volume.linux.is_device_mapper", is_device_mapper);
 		hal_device_property_set_bool (
 			d, "volume.is_disc", 
-			strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0);
+			strcmp (hal_device_property_get_string (parent, "storage.drive_type") ? : "", "cdrom") == 0);
 
 
 		is_physical_partition = TRUE;
@@ -1404,7 +1404,7 @@
 		hal_device_property_set_bool (d, "volume.is_partition", is_physical_partition);
 
 		hal_device_property_set_string (d, "info.category", "volume");
-		if (strcmp(hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0) {
+		if (strcmp(hal_device_property_get_string (parent, "storage.drive_type") ? : "", "cdrom") == 0) {
 			hal_device_add_capability (d, "volume.disc");
 		}
 		hal_device_add_capability (d, "volume");