diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 7e881cb976..4b3b0a14d0 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -194,7 +194,7 @@ namespace MediaBrowser.Providers.Manager
                     if (item is Episode && directory.Equals("metadata", StringComparison.Ordinal))
                     {
                         var parentDirectoryPath = Directory.GetParent(currentPath).FullName;
-                        if (!_fileSystem.GetFiles(parentDirectoryPath).Any())
+                        if (_fileSystem.DirectoryExists(parentDirectoryPath) && !_fileSystem.GetFiles(parentDirectoryPath).Any())
                         {
                             try
                             {
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index f89dc51795..245489ea21 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -384,7 +384,7 @@ namespace MediaBrowser.Providers.Manager
             {
                 var oldLocalMetadataDirectory = Path.Combine(item.ContainingFolderPath, "metadata");
                 var localImages = images.Where(i => i.Path.StartsWith(oldLocalMetadataDirectory, StringComparison.Ordinal)).ToList();
-                if (!_fileSystem.GetFiles(oldLocalMetadataDirectory).Any())
+                if (_fileSystem.DirectoryExists(oldLocalMetadataDirectory) && !_fileSystem.GetFiles(oldLocalMetadataDirectory).Any())
                 {
                     Directory.Delete(oldLocalMetadataDirectory);
                 }