diff --git a/src/libtomahawk/sip/PeerInfo.cpp b/src/libtomahawk/sip/PeerInfo.cpp
index e733feee8..da33ebaea 100644
--- a/src/libtomahawk/sip/PeerInfo.cpp
+++ b/src/libtomahawk/sip/PeerInfo.cpp
@@ -232,9 +232,16 @@ PeerInfo::contactId() const
 const QString
 PeerInfo::nodeId() const
 {
-    Q_ASSERT( !d_func()->sipInfos.isEmpty() );
+    Q_D( const PeerInfo );
+
+    if ( d->sipInfos.isEmpty() )
+    {
+        // Return an empty nodeId if we have not yet received the acutal nodeId.
+        return QString();
+    }
+
     // All sip infos share the same nodeId
-    return d_func()->sipInfos.first().nodeId();
+    return d->sipInfos.first().nodeId();
 }
 
 const QString