Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 7 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index fd4092974..04ebcd903 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -458,6 +458,13 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             var syncOptions = _config.GetSyncOptions();
             var user = _userManager.GetUserById(job.UserId);
+            if (user == null)
+            {
+                jobItem.Status = SyncJobItemStatus.Failed;
+                _logger.Error("User not found. Cannot complete the sync job.");
+                await _syncManager.UpdateSyncJobItemInternal(jobItem).ConfigureAwait(false);
+                return;
+            }
 
             var video = item as Video;
             if (video != null)