diff --git a/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp b/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp
index ce91d1a19..7dbbcf0f8 100644
--- a/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp
+++ b/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp
@@ -89,7 +89,9 @@ LastFmPlugin::LastFmPlugin( InfoSystemWorker* parent )
 
 LastFmPlugin::~LastFmPlugin()
 {
+    qDebug() << Q_FUNC_INFO << " beginning";
     delete m_scrobbler;
+    qDebug() << Q_FUNC_INFO << " exiting";
 }
 
 
diff --git a/src/libtomahawk/infosystem/infosystem.cpp b/src/libtomahawk/infosystem/infosystem.cpp
index e42edda5b..84a15bd67 100644
--- a/src/libtomahawk/infosystem/infosystem.cpp
+++ b/src/libtomahawk/infosystem/infosystem.cpp
@@ -78,17 +78,44 @@ InfoSystem::InfoSystem(QObject *parent)
 
 InfoSystem::~InfoSystem()
 {
-    qDebug() << Q_FUNC_INFO;
+    qDebug() << Q_FUNC_INFO << " beginning";
+
+    if ( m_infoSystemWorkerThreadController )
+        m_infoSystemWorkerThreadController->quit();
+
+    qDebug() << Q_FUNC_INFO << " sent quit signals";
+
+    if( m_infoSystemWorkerThreadController )
+    {
+        while( !m_infoSystemWorkerThreadController->isFinished() )
+        {
+            qDebug() << Q_FUNC_INFO << " worker thread controller not finished, processing events";
+            QCoreApplication::processEvents( QEventLoop::AllEvents, 200 );
+            TomahawkUtils::Sleep::msleep( 100 );
+        }
+
+        qDebug() << Q_FUNC_INFO << " worker is finished, deleting worker";
+        if( m_worker )
+        {
+            delete m_worker;
+            m_worker = 0;
+        }
+
+        qDebug() << Q_FUNC_INFO << " worker finished being deleted";
+        delete m_infoSystemWorkerThreadController;
+        m_infoSystemWorkerThreadController = 0;
+    }
+
+    qDebug() << Q_FUNC_INFO << " done deleting worker";
 
     if ( m_infoSystemCacheThreadController )
         m_infoSystemCacheThreadController->quit();
-    if ( m_infoSystemWorkerThreadController )
-        m_infoSystemWorkerThreadController->quit();
     
     if( m_infoSystemCacheThreadController )
     {
         while( !m_infoSystemCacheThreadController->isFinished() )
         {
+            qDebug() << Q_FUNC_INFO << " cache thread controller not finished, processing events";
             QCoreApplication::processEvents( QEventLoop::AllEvents, 200 );
             TomahawkUtils::Sleep::msleep( 100 );
         }
@@ -102,24 +129,7 @@ InfoSystem::~InfoSystem()
         delete m_infoSystemCacheThreadController;
         m_infoSystemCacheThreadController = 0;
     }
-
-    if( m_infoSystemWorkerThreadController )
-    {
-        while( !m_infoSystemWorkerThreadController->isFinished() )
-        {
-            QCoreApplication::processEvents( QEventLoop::AllEvents, 200 );
-            TomahawkUtils::Sleep::msleep( 100 );
-        }
-
-        if( m_worker )
-        {
-            delete m_worker;
-            m_worker = 0;
-        }
-
-        delete m_infoSystemWorkerThreadController;
-        m_infoSystemWorkerThreadController = 0;
-    }
+    qDebug() << Q_FUNC_INFO << " done deleting cache";
 }
 
 
diff --git a/src/libtomahawk/infosystem/infosystem.h b/src/libtomahawk/infosystem/infosystem.h
index f4fe24871..6dcb2a912 100644
--- a/src/libtomahawk/infosystem/infosystem.h
+++ b/src/libtomahawk/infosystem/infosystem.h
@@ -107,7 +107,10 @@ class DLLEXPORT InfoPlugin : public QObject
 public:
     InfoPlugin( InfoSystemWorker *parent );
 
-    virtual ~InfoPlugin() {}
+    virtual ~InfoPlugin()
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
 
 signals:
     void getCachedInfo( Tomahawk::InfoSystem::InfoCriteriaHash criteria, qint64 newMaxAge, QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, Tomahawk::InfoSystem::InfoCustomData customData );
diff --git a/src/libtomahawk/infosystem/infosystemworker.cpp b/src/libtomahawk/infosystem/infosystemworker.cpp
index 4b376a932..763e34a65 100644
--- a/src/libtomahawk/infosystem/infosystemworker.cpp
+++ b/src/libtomahawk/infosystem/infosystemworker.cpp
@@ -44,12 +44,13 @@ InfoSystemWorker::InfoSystemWorker()
 
 InfoSystemWorker::~InfoSystemWorker()
 {
-    qDebug() << Q_FUNC_INFO;
+    qDebug() << Q_FUNC_INFO << " beginning";
     Q_FOREACH( InfoPluginPtr plugin, m_plugins )
     {
         if( plugin )
             delete plugin.data();
     }
+    qDebug() << Q_FUNC_INFO << " is done deleting plugins";
 }