1 files changed, 13 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 6283ceb2a..222dbbf78 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1235,7 +1235,19 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <returns>IEnumerable{System.String}.</returns>
         public IEnumerable<string> GetAllIntroFiles()
         {
-            return IntroProviders.SelectMany(i => i.GetAllIntroFiles());
+            return IntroProviders.SelectMany(i =>
+            {
+                try
+                {
+                    return i.GetAllIntroFiles().ToList();
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error getting intro files", ex);
+
+                    return new List<string>();
+                }
+            });
         }
 
         /// <summary>