diff --git a/src/libtomahawk/database/Database.cpp b/src/libtomahawk/database/Database.cpp
index 2885d651f..b7613448c 100644
--- a/src/libtomahawk/database/Database.cpp
+++ b/src/libtomahawk/database/Database.cpp
@@ -341,6 +341,9 @@ Database::createCommandInstance(const QVariant& op, const source_ptr& source)
     const QString commandName = op.toMap().value( "command" ).toString();
 
     dbcmd_ptr command = createCommandInstance( commandName );
+    if ( command.isNull() )
+        return command;
+
     command->setSource( source );
     QJson::QObjectHelper::qvariant2qobject( op.toMap(), command.data() );
     return command;