diff --git a/src/libtomahawk/database/databaseworker.cpp b/src/libtomahawk/database/databaseworker.cpp
index 2e732f085..8cc7baee5 100644
--- a/src/libtomahawk/database/databaseworker.cpp
+++ b/src/libtomahawk/database/databaseworker.cpp
@@ -22,7 +22,9 @@ DatabaseWorker::DatabaseWorker( DatabaseImpl* lib, Database* db, bool mutates )
 
 DatabaseWorker::~DatabaseWorker()
 {
-    qDebug() << Q_FUNC_INFO;
+    qDebug() << Q_FUNC_INFO << m_outstanding;
+
+    qDebug () << m_commands;
 
     quit();
     wait( 5000 );
diff --git a/src/libtomahawk/source.cpp b/src/libtomahawk/source.cpp
index 4fa3ed240..a4944f30e 100644
--- a/src/libtomahawk/source.cpp
+++ b/src/libtomahawk/source.cpp
@@ -33,6 +33,7 @@ Source::Source( const QString &username )
     , m_id( 0 )
     , m_cc( 0 )
 {
+    qDebug() << Q_FUNC_INFO;
 }
 
 
diff --git a/src/libtomahawk/sourcelist.cpp b/src/libtomahawk/sourcelist.cpp
index a106926ee..d46402dd3 100644
--- a/src/libtomahawk/sourcelist.cpp
+++ b/src/libtomahawk/sourcelist.cpp
@@ -2,6 +2,8 @@
 
 #include <QDebug>
 
+#include "network/controlconnection.h"
+
 using namespace Tomahawk;
 
 SourceList* SourceList::s_instance = 0;
@@ -79,6 +81,8 @@ SourceList::remove( Tomahawk::Source* s )
         m_sources_id2name.remove( src->id() );
         m_sources.remove( s->userName() );
         qDebug() << "SourceList::remove(" << s->userName() << "), total sources now:" << m_sources.size();
+
+        src->controlConnection()->shutdown( true );
     }
 
     emit sourceRemoved( src );