Merge pull request #1118 from MediaBrowser/dev

3.0.5641.4

1 files changed, 10 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
index e3c8e6d25..557b531b4 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
@@ -59,11 +59,18 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                     var organizer = new EpisodeFileOrganizer(_organizationService, _config, _fileSystem, _logger, _libraryManager,
                         _libraryMonitor, _providerManager);
 
-                    var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
+                    try
+                    {
+                        var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
 
-                    if (result.Status == FileSortingStatus.Success)
+                        if (result.Status == FileSortingStatus.Success)
+                        {
+                            scanLibrary = true;
+                        }
+                    }
+                    catch (Exception ex)
                     {
-                        scanLibrary = true;
+                        _logger.ErrorException("Error organizing episode {0}", ex, file);
                     }
 
                     numComplete++;