Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 7 insertions, 2 deletions

diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 8fcef654d..e644f1f31 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -110,9 +110,14 @@ namespace MediaBrowser.Api
 
             if (auth != null && auth.ContainsKey("UserId"))
             {
-                var user = UserManager.GetUserById(new Guid(auth["UserId"]));
+                var userId = auth["UserId"];
 
-                UserManager.LogUserActivity(user, auth["Client"], auth["DeviceId"], auth["Device"] ?? string.Empty);
+                if (!string.IsNullOrEmpty(userId))
+                {
+                    var user = UserManager.GetUserById(new Guid(userId));
+
+                    UserManager.LogUserActivity(user, auth["Client"], auth["DeviceId"], auth["Device"] ?? string.Empty);
+                }
             }
         }