diff -Naur hal-0.5.12/hald/linux/probing/probe-volume.c hal-0.5.12-magellan/hald/linux/probing/probe-volume.c
--- hal-0.5.12/hald/linux/probing/probe-volume.c	2009-05-10 21:11:44.000000000 +0200
+++ hal-0.5.12-magellan/hald/linux/probing/probe-volume.c	2009-06-17 01:48:16.000000000 +0200
@@ -97,7 +97,7 @@
 
 	if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL))
 		type = "";
-	if (libhal_changeset_set_property_string (cs, "volume.fstype", type))
+	if (!libhal_changeset_set_property_string (cs, "volume.fstype", type))
 		libhal_changeset_set_property_string (cs, "volume.fstype", "");
 	HAL_DEBUG(("volume.fstype = '%s'", type));
 
diff -Naur hal-0.5.12/tools/hal-storage-mount.c hal-0.5.12-magellan/tools/hal-storage-mount.c
--- hal-0.5.12/tools/hal-storage-mount.c	2009-05-10 21:11:44.000000000 +0200
+++ hal-0.5.12-magellan/tools/hal-storage-mount.c	2009-06-17 01:49:58.000000000 +0200
@@ -786,7 +786,8 @@
 		/* don't consider uid= on vfat, iso9660, hfs and udf change-uid for the purpose of policy
 		 * (since these doesn't contain uid/gid bits) 
 		 */
-		if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
+		if (libhal_volume_get_fstype (volume) != NULL &&
+		    strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
 		    strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
 		    strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 0 &&
 		    strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 &&