diff --git a/src/libtomahawk/album.cpp b/src/libtomahawk/album.cpp
index ef4426bf3..ade2e33ef 100644
--- a/src/libtomahawk/album.cpp
+++ b/src/libtomahawk/album.cpp
@@ -35,7 +35,7 @@ album_ptr
 Album::get( const Tomahawk::artist_ptr& artist, const QString& name, bool autoCreate )
 {
     int albid = Database::instance()->impl()->albumId( artist->id(), name, autoCreate );
-    if ( albid < 1 )
+    if ( albid < 1 && autoCreate )
         return album_ptr();
 
     return Album::get( albid, name, artist );
diff --git a/src/libtomahawk/artist.cpp b/src/libtomahawk/artist.cpp
index f5c852b64..263c57804 100644
--- a/src/libtomahawk/artist.cpp
+++ b/src/libtomahawk/artist.cpp
@@ -43,7 +43,7 @@ artist_ptr
 Artist::get( const QString& name, bool autoCreate )
 {
     int artid = Database::instance()->impl()->artistId( name, autoCreate );
-    if ( artid < 1 )
+    if ( artid < 1 && autoCreate )
         return artist_ptr();
 
     return Artist::get( artid, name );
diff --git a/src/libtomahawk/database/databaseimpl.cpp b/src/libtomahawk/database/databaseimpl.cpp
index 9064ccaa0..311e0c7c4 100644
--- a/src/libtomahawk/database/databaseimpl.cpp
+++ b/src/libtomahawk/database/databaseimpl.cpp
@@ -337,7 +337,7 @@ DatabaseImpl::trackId( int artistid, const QString& name_orig, bool& isnew )
     query.addBindValue( sortname );
     if( !query.exec() )
     {
-        tDebug() << "Failed to insert track:" << name_orig ;
+        tDebug() << "Failed to insert track:" << name_orig;
         return 0;
     }
 
@@ -388,7 +388,7 @@ DatabaseImpl::albumId( int artistid, const QString& name_orig, bool& isnew )
     query.addBindValue( sortname );
     if( !query.exec() )
     {
-        tDebug() << "Failed to insert album: " << name_orig ;
+        tDebug() << "Failed to insert album:" << name_orig;
         return 0;
     }
 
diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/treemodel.cpp
index a7e67e4e0..ebe9bd008 100644
--- a/src/libtomahawk/playlist/treemodel.cpp
+++ b/src/libtomahawk/playlist/treemodel.cpp
@@ -835,8 +835,7 @@ TreeModel::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QV
 
             foreach ( const QString& albumName, albums )
             {
-                int albumId = 0;
-                Tomahawk::album_ptr album = Tomahawk::Album::get( albumId, albumName, artist );
+                Tomahawk::album_ptr album = Tomahawk::Album::get( artist, albumName, false );
                 al << album;
             }
             onAlbumsAdded( al, requestData.customData[ "row" ] );