Index: rhythmdb/rhythmdb.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/rhythmdb/rhythmdb.c,v
retrieving revision 1.164
diff -u -r1.164 rhythmdb.c
--- rhythmdb/rhythmdb.c	30 Jan 2006 09:20:38 -0000	1.164
+++ rhythmdb/rhythmdb.c	3 Feb 2006 13:23:24 -0000
@@ -1208,8 +1208,11 @@
 			       &val))) {
 		g_value_init (&val, G_TYPE_STRING);
 		g_value_set_static_string (&val, unknown);
-	} else if (g_value_get_string (&val)[0] == '\0')
-		g_value_set_static_string (&val, unknown);
+	} else {
+                const gchar *str = g_value_get_string (&val);
+                if (str == NULL || str[0] == '\0')
+	        	g_value_set_static_string (&val, unknown);
+        }
 	rhythmdb_entry_set_internal (db, entry, TRUE, prop, &val);
 	g_value_unset (&val);
 }