1 files changed, 13 insertions, 1 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
index 48fc72913..a96630efe 100644
--- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
@@ -112,7 +112,19 @@ namespace MediaBrowser.Api.UserLibrary
         protected override IEnumerable<MusicArtist> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items)
         {
             return LibraryManager.GetAllArtists(items)
-                .Select(name => LibraryManager.GetArtist(name));
+                .Select(name =>
+                {
+                    try
+                    {
+                        return LibraryManager.GetArtist(name);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.ErrorException("Error getting artist {0}", ex, name);
+                        return null;
+                    }
+
+                }).Where(i => i != null);
         }
 
         protected override IEnumerable<BaseItem> GetLibraryItems(MusicArtist item, IEnumerable<BaseItem> libraryItems)