diff --git a/src/libtomahawk/network/ConnectionManager.cpp b/src/libtomahawk/network/ConnectionManager.cpp
index 4a491bbe1..2ecbf8de5 100644
--- a/src/libtomahawk/network/ConnectionManager.cpp
+++ b/src/libtomahawk/network/ConnectionManager.cpp
@@ -220,10 +220,10 @@ ConnectionManager::connectToPeer( const Tomahawk::peerinfo_ptr &peerInfo, bool l
     {
         // We are already connected to this peer, so just add some more details.
         peerInfoDebug( peerInfo ) << "Existing connection found, not connecting.";
-        cconn->addPeerInfo( peerInfo );
         if ( cconn != NULL )
         {
-            d_func()->controlConnection = QPointer<ControlConnection>(cconn);
+            cconn->addPeerInfo( peerInfo );
+            d_func()->controlConnection = QPointer<ControlConnection>( cconn );
         }
         deactivate();
         return;