diff --git a/src/libtomahawk/album.cpp b/src/libtomahawk/album.cpp
index 43744aae5..c4c382b42 100644
--- a/src/libtomahawk/album.cpp
+++ b/src/libtomahawk/album.cpp
@@ -22,7 +22,8 @@ Album::get( unsigned int id, const QString& name, const Tomahawk::artist_ptr& ar
     }
 
     album_ptr a = album_ptr( new Album( id, name, artist ) );
-    s_albums.insert( id, a );
+    if ( id > 0 )
+        s_albums.insert( id, a );
 
     return a;
 }
diff --git a/src/libtomahawk/artist.cpp b/src/libtomahawk/artist.cpp
index 38fc1b691..ec84884e6 100644
--- a/src/libtomahawk/artist.cpp
+++ b/src/libtomahawk/artist.cpp
@@ -25,7 +25,6 @@ Artist::get( unsigned int id, const QString& name )
     }
 
     artist_ptr a = artist_ptr( new Artist( id, name ) );
-
     if ( id > 0 )
         s_artists.insert( id, a );