diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/treemodel.cpp
index d3ebdc11f..28f4543c0 100644
--- a/src/libtomahawk/playlist/treemodel.cpp
+++ b/src/libtomahawk/playlist/treemodel.cpp
@@ -827,7 +827,9 @@ TreeModel::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QV
             InfoSystem::InfoCriteriaHash inputInfo;
             inputInfo = requestData.input.value< InfoSystem::InfoCriteriaHash >();
             artist_ptr artist = Artist::get( inputInfo[ "artist" ], false );
-            Q_ASSERT( !artist.isNull() );
+
+            if ( artist.isNull() )
+                return;
 
             foreach ( const QString& albumName, albums )
             {