--- old-trash/sources/rb-ipod-source.c	2006-11-18 09:32:18.000000000 +1000
+++ new-trash/sources/rb-ipod-source.c	2006-11-18 09:32:18.000000000 +1000
@@ -124,9 +124,17 @@
 	Itdb_Playlist *mpl;
 	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
 
+	if (name == NULL)
+		return;
+
 	mpl = itdb_playlist_mpl (priv->ipod_db);
+	if (mpl == NULL) {
+		rb_debug ("Couldn't find iPod's master playlist");
+		return;
+	}
+
 	rb_debug ("Renaming iPod from %s to %s", mpl->name, name);
-	if (strcmp (mpl->name, name) == 0) {
+	if (mpl->name != NULL && strcmp (mpl->name, name) == 0) {
 		rb_debug ("iPod is already named %s", name);
 		return;
 	}
