diff --git a/src/libtomahawk/PlaylistEntry.cpp b/src/libtomahawk/PlaylistEntry.cpp
index 69f640250..3efc2487a 100644
--- a/src/libtomahawk/PlaylistEntry.cpp
+++ b/src/libtomahawk/PlaylistEntry.cpp
@@ -56,7 +56,15 @@ QVariant
 PlaylistEntry::queryVariant() const
 {
     Q_D( const PlaylistEntry );
-    return d->query->toVariant();
+
+    if ( d->query.isNull() )
+    {
+        return QVariantMap();
+    }
+    else
+    {
+        return d->query->toVariant();
+    }
 }