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

1 files changed, 7 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 0e4a3bcf1..d47135c65 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -286,6 +286,13 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         private async Task FillMetadata(SyncJob job)
         {
+            var user = _userManager.GetUserById(job.UserId);
+
+            if (user == null)
+            {
+                return;
+            }
+
             var target = GetSyncTargets(job.UserId)
                 .FirstOrDefault(i => string.Equals(i.Id, job.TargetId, StringComparison.OrdinalIgnoreCase));
 
@@ -302,8 +309,6 @@ namespace MediaBrowser.Server.Implementations.Sync
             {
                 var processor = GetSyncJobProcessor();
 
-                var user = _userManager.GetUserById(job.UserId);
-
                 item = (await processor
                     .GetItemsForSync(job.Category, job.ParentId, job.RequestedItemIds, user, job.UnwatchedOnly).ConfigureAwait(false))
                     .FirstOrDefault();