diff --git a/rhythmdb/rhythmdb-private.h b/rhythmdb/rhythmdb-private.h
index 0e657c6..db87321 100644
--- a/rhythmdb/rhythmdb-private.h
+++ b/rhythmdb/rhythmdb-private.h
@@ -224,6 +224,7 @@ typedef struct
 } RhythmDBEvent;
 
 /* from rhythmdb.c */
+void rhythmdb_entry_set_mount_point (RhythmDB *db, RhythmDBEntry *entry, const char *realuri);
 void rhythmdb_entry_set_visibility (RhythmDB *db, RhythmDBEntry *entry,
 				    gboolean visibility);
 void rhythmdb_entry_set_internal (RhythmDB *db, RhythmDBEntry *entry,
diff --git a/rhythmdb/rhythmdb-song-entry-types.c b/rhythmdb/rhythmdb-song-entry-types.c
index 1ed629b..cab5bd4 100644
--- a/rhythmdb/rhythmdb-song-entry-types.c
+++ b/rhythmdb/rhythmdb-song-entry-types.c
@@ -136,6 +136,9 @@ song_update_availability (RhythmDBEntryType *entry_type,
 
 	case RHYTHMDB_ENTRY_AVAIL_CHECKED:
 		update_entry_last_seen (db, entry);
+		if (rhythmdb_entry_get_boolean (entry, RHYTHMDB_PROP_HIDDEN) == TRUE) {
+			rhythmdb_entry_set_mount_point (db, entry, rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION));
+		}
 		rhythmdb_entry_set_visibility (db, entry, TRUE);
 		break;
 
diff --git a/rhythmdb/rhythmdb.c b/rhythmdb/rhythmdb.c
index aad947d..0b200f8 100644
--- a/rhythmdb/rhythmdb.c
+++ b/rhythmdb/rhythmdb.c
@@ -263,9 +263,6 @@ static void rhythmdb_read_leave (RhythmDB *db);
 static void rhythmdb_process_one_event (RhythmDBEvent *event, RhythmDB *db);
 static gpointer action_thread_main (RhythmDB *db);
 static gpointer query_thread_main (RhythmDBQueryThreadData *data);
-static void rhythmdb_entry_set_mount_point (RhythmDB *db,
- 					    RhythmDBEntry *entry,
- 					    const gchar *realuri);
 
 static gboolean rhythmdb_idle_save (RhythmDB *db);
 static void library_location_changed_cb (GConfClient *client,
@@ -3307,9 +3304,18 @@ rhythmdb_entry_set_internal (RhythmDB *db,
 	switch (G_VALUE_TYPE (value)) {
 	case G_TYPE_STRING:
 #ifndef G_DISABLE_ASSERT
-		/* the playback error is allowed to be NULL */
-		if (propid != RHYTHMDB_PROP_PLAYBACK_ERROR || g_value_get_string (value))
+		/* some properties are allowed to be NULL */
+		if (g_value_get_string (value) == NULL) {
+			switch (propid) {
+			case RHYTHMDB_PROP_PLAYBACK_ERROR:
+			case RHYTHMDB_PROP_MOUNTPOINT:
+				break;
+			default:
+				g_assert (g_value_get_string (value) != NULL);
+			}
+		} else {
 			g_assert (g_utf8_validate (g_value_get_string (value), -1, NULL));
+		}
 #endif
 		if (g_value_get_string (value) && g_value_get_string (&old_value)) {
 			nop = (strcmp (g_value_get_string (value), g_value_get_string (&old_value)) == 0);
@@ -3433,7 +3439,10 @@ rhythmdb_entry_set_internal (RhythmDB *db,
 			if (entry->mountpoint != NULL) {
 				rb_refstring_unref (entry->mountpoint);
 			}
-			entry->mountpoint = rb_refstring_new (g_value_get_string (value));
+			if (g_value_get_string (value))
+				entry->mountpoint = rb_refstring_new (g_value_get_string (value));
+			else
+				entry->mountpoint = NULL;
 			break;
 		case RHYTHMDB_PROP_FILE_SIZE:
 			entry->file_size = g_value_get_uint64 (value);
@@ -4613,7 +4622,7 @@ rhythmdb_entry_type_get_by_name (RhythmDB *db,
 	return (RhythmDBEntryType *) t;
 }
 
-static void
+void
 rhythmdb_entry_set_mount_point (RhythmDB *db,
 				RhythmDBEntry *entry,
 				const gchar *realuri)
@@ -4621,15 +4630,16 @@ rhythmdb_entry_set_mount_point (RhythmDB *db,
 	gchar *mount_point;
 	GValue value = {0, };
 
+	g_value_init (&value, G_TYPE_STRING);
 	mount_point = rb_uri_get_mount_point (realuri);
 	if (mount_point != NULL) {
-		g_value_init (&value, G_TYPE_STRING);
 		g_value_take_string (&value, mount_point);
-		rhythmdb_entry_set_internal (db, entry, FALSE,
-					     RHYTHMDB_PROP_MOUNTPOINT,
-					     &value);
-		g_value_unset (&value);
 	}
+
+	rhythmdb_entry_set_internal (db, entry, FALSE,
+				     RHYTHMDB_PROP_MOUNTPOINT,
+				     &value);
+	g_value_unset (&value);
 }
 
 void
