diff --git a/src/libtomahawk/AlbumPlaylistInterface.cpp b/src/libtomahawk/AlbumPlaylistInterface.cpp
index aef2aefcd..2ecfd8175 100644
--- a/src/libtomahawk/AlbumPlaylistInterface.cpp
+++ b/src/libtomahawk/AlbumPlaylistInterface.cpp
@@ -175,6 +175,9 @@ AlbumPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData re
                 foreach ( const QString& trackName, tracks )
                 {
                     query_ptr query = Query::get( inputInfo[ "artist" ], trackName, inputInfo[ "album" ] );
+                    if ( query.isNull() )
+                        continue;
+
                     query->setAlbumPos( trackNo++ );
                     ql << query;
                 }