diff --git a/src/libtomahawk/artist.cpp b/src/libtomahawk/artist.cpp
index 87ce124af..c44aa8ce1 100644
--- a/src/libtomahawk/artist.cpp
+++ b/src/libtomahawk/artist.cpp
@@ -25,7 +25,9 @@ Artist::get( unsigned int id, const QString& name, const Tomahawk::collection_pt
     }
 
     artist_ptr a = artist_ptr( new Artist( id, name, collection ) );
-    s_artists.insert( id, a );
+
+    if ( id > 0 )
+        s_artists.insert( id, a );
 
     return a;
 }
diff --git a/src/scriptresolver.cpp b/src/scriptresolver.cpp
index 1dd0b68b1..272a4810f 100644
--- a/src/scriptresolver.cpp
+++ b/src/scriptresolver.cpp
@@ -195,7 +195,7 @@ ScriptResolver::doSetup( const QVariantMap& m )
     qDebug() << Q_FUNC_INFO << m;
     m_name       = m.value( "name" ).toString();
     m_weight     = m.value( "weight", 0 ).toUInt();
-    m_timeout    = m.value( "timeout", 5000 ).toUInt();
+    m_timeout    = m.value( "timeout", 25 ).toUInt() * 1000;
     m_preference = m.value( "preference", 0 ).toUInt();
     qDebug() << "SCRIPT" << m_cmd << "READY," << endl
              << "name" << m_name << endl