Merge branch 'master' into xml

1 files changed, 14 insertions, 2 deletions

diff --git a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
index c0706ceeb..25a8ad596 100644
--- a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.LocalMetadata.Images
 {
@@ -12,11 +13,16 @@ namespace MediaBrowser.LocalMetadata.Images
     {
         private readonly IServerConfigurationManager _config;
         private readonly IFileSystem _fileSystem;
+        private readonly ILogger _logger;
 
-        public InternalMetadataFolderImageProvider(IServerConfigurationManager config, IFileSystem fileSystem)
+        public InternalMetadataFolderImageProvider(
+            IServerConfigurationManager config,
+            IFileSystem fileSystem,
+            ILogger<InternalMetadataFolderImageProvider> logger)
         {
             _config = config;
             _fileSystem = fileSystem;
+            _logger = logger;
         }
 
         public string Name => "Internal Images";
@@ -53,12 +59,18 @@ namespace MediaBrowser.LocalMetadata.Images
         {
             var path = item.GetInternalMetadataPath();
 
+            if (!Directory.Exists(path))
+            {
+                return new List<LocalImageInfo>();
+            }
+
             try
             {
                 return new LocalImageProvider(_fileSystem).GetImages(item, path, false, directoryService);
             }
-            catch (IOException)
+            catch (IOException ex)
             {
+                _logger.LogError(ex, "Error while getting images for {Library}", item.Name);
                 return new List<LocalImageInfo>();
             }
         }