diff --git a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp
index 5c021a95e..4dded864a 100644
--- a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp
+++ b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp
@@ -65,6 +65,9 @@ DatabaseCommand_SetDynamicPlaylistRevision::postCommitHook()
     foreach( const QVariant& v, orderedguids() )
         orderedentriesguids << v.toString();
     
+    Q_ASSERT( !source().isNull() );
+    Q_ASSERT( !source()->collection().isNull() );
+    qDebug() << "Postcommitting this playlist:" << playlistguid() << source().isNull() << source().data();
     // private, but we are a friend. will recall itself in its own thread:
     dynplaylist_ptr playlist = source()->collection()->dynamicPlaylist( playlistguid() );
     
diff --git a/src/libtomahawk/playlist.cpp b/src/libtomahawk/playlist.cpp
index 9f6a5033d..f3b92f5fe 100644
--- a/src/libtomahawk/playlist.cpp
+++ b/src/libtomahawk/playlist.cpp
@@ -382,7 +382,7 @@ Playlist::setNewRevision( const QString& rev,
 }
 
 
-const source_ptr&
+source_ptr
 Playlist::author()
 { 
     return m_source; 
diff --git a/src/libtomahawk/playlist.h b/src/libtomahawk/playlist.h
index d1837d3b6..adfbb65c2 100644
--- a/src/libtomahawk/playlist.h
+++ b/src/libtomahawk/playlist.h
@@ -113,7 +113,7 @@ public:
 
     virtual void loadRevision( const QString& rev = "" );
 
-    const source_ptr& author();
+    source_ptr author();
     const QString& currentrevision()    { return m_currentrevision; }
     const QString& title()              { return m_title; }
     const QString& info()               { return m_info; }
diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
index f4918d86f..ed5e5bba1 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
@@ -248,7 +248,11 @@ DynamicPlaylist::reportCreated( const Tomahawk::dynplaylist_ptr& self )
 {
     qDebug() << Q_FUNC_INFO;
     Q_ASSERT( self.data() == this );
+    Q_ASSERT( !author().isNull() );
+    Q_ASSERT( !author()->collection().isNull() );
     // will emit Collection::playlistCreated(...)
+    qDebug() << "Creating dynplaylist belonging to:" << author().data() << author().isNull();
+    qDebug() << "REPORTING DYNAMIC PLAYLIST CREATED:" << this << author()->friendlyName();
     author()->collection()->addDynamicPlaylist( self );    
 }
 
diff --git a/src/sourcetree/sourcetreeitem.cpp b/src/sourcetree/sourcetreeitem.cpp
index 2153bd62d..bd340cf1d 100644
--- a/src/sourcetree/sourcetreeitem.cpp
+++ b/src/sourcetree/sourcetreeitem.cpp
@@ -208,7 +208,7 @@ void SourceTreeItem::onDynamicPlaylistLoaded( DynamicPlaylistRevision revision )
 //         qDebug() << "found dynamic playlist:" << (*pl)->title() << type;
         if ( type == SourcesModel::DynamicPlaylistSource && ptr == qlonglong( pl->data() ) )
         {
-            //qDebug() << "Found playlist!";
+            //qDebug() << "Found dynamicplaylist!";
             pi->setEnabled( true );
             m_current_dynamic_revisions.insert( pl->data()->guid(), revision.revisionguid );
         }