diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp
index 165fc6e4e..48a662765 100644
--- a/src/libtomahawk/TomahawkSettings.cpp
+++ b/src/libtomahawk/TomahawkSettings.cpp
@@ -512,6 +512,8 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
         endGroup();
 
         setPlaylistUpdaters( updaters );
+
+        remove( "playlistupdaters" );
     }
 }
 
diff --git a/src/libtomahawk/playlist/XspfUpdater.cpp b/src/libtomahawk/playlist/XspfUpdater.cpp
index 01f7dda71..3a4ab3e28 100644
--- a/src/libtomahawk/playlist/XspfUpdater.cpp
+++ b/src/libtomahawk/playlist/XspfUpdater.cpp
@@ -63,6 +63,12 @@ XspfUpdater::XspfUpdater( const playlist_ptr& pl, int interval, bool autoUpdate,
 
     connect( m_toggleCheckbox, SIGNAL( toggled( bool ) ), this, SLOT( setAutoUpdate( bool ) ) );
 #endif
+
+    QVariantHash s = settings();
+    s[ "autoupdate" ] = m_autoUpdate;
+    s[ "interval" ] = interval;
+    s[ "xspfurl" ] = xspfUrl;
+    saveSettings( s );
 }
 
 
diff --git a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp
index 79fc8d654..573f02e07 100644
--- a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp
+++ b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp
@@ -191,6 +191,9 @@ RecentPlaylistsModel::updatePlaylist()
 
     for ( int i = 0; i < m_playlists.size(); i++ )
     {
+        if ( m_playlists[ i ].isNull() )
+            continue;
+
         if ( m_playlists[ i ]->guid() == p->guid() )
         {
             QModelIndex idx = index( i, 0, QModelIndex() );