diff --git a/Ombi.Api/EmbyApi.cs b/Ombi.Api/EmbyApi.cs
index 1cfc0bf0a..9625ffa4f 100644
--- a/Ombi.Api/EmbyApi.cs
+++ b/Ombi.Api/EmbyApi.cs
@@ -64,7 +64,6 @@ namespace Ombi.Api
 
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetUsers for Emby, Retrying {0}", timespan), new[] {
                 TimeSpan.FromSeconds (1),
-                TimeSpan.FromSeconds(5)
             });
 
             var obj = policy.Execute(() => Api.ExecuteJson<List<EmbyUser>>(request, baseUri));
@@ -199,8 +198,7 @@ namespace Ombi.Api
 
 
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling LogInfor Emby, Retrying {0}", timespan), new[] {
-                TimeSpan.FromSeconds (1),
-                TimeSpan.FromSeconds(5)
+                TimeSpan.FromSeconds (1)
             });
 
             var obj = policy.Execute(() => Api.Execute(request, baseUri));
diff --git a/Ombi.UI/Modules/UserLoginModule.cs b/Ombi.UI/Modules/UserLoginModule.cs
index fd3dea0b3..1fd82cb2e 100644
--- a/Ombi.UI/Modules/UserLoginModule.cs
+++ b/Ombi.UI/Modules/UserLoginModule.cs
@@ -330,7 +330,15 @@ namespace Ombi.UI.Modules
                 if (settings.UserAuthentication) // Authenticate with Plex
                 {
                     Log.Debug("Need to auth and also provide pass");
-                    var signedIn = (EmbyUser)EmbyApi.LogIn(username, password, embySettings.ApiKey, embySettings.FullUri);
+                    EmbyUser signedIn = null;
+                    try
+                    {
+                        signedIn = (EmbyUser)EmbyApi.LogIn(username, password, embySettings.ApiKey, embySettings.FullUri);
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error(e);
+                    }
                     if (signedIn != null)
                     {
                         Log.Debug("Correct credentials, checking if the user is account owner or in the friends list");
@@ -732,15 +740,32 @@ namespace Ombi.UI.Modules
 
         private bool CheckIfEmbyUser(string username, EmbySettings s)
         {
-            var users = EmbyApi.GetUsers(s.FullUri, s.ApiKey);
-            var allUsers = users?.Where(x => !string.IsNullOrEmpty(x.Name));
-            return allUsers != null && allUsers.Any(x => x.Name.Equals(username, StringComparison.CurrentCultureIgnoreCase));
+            try
+            {
+                var users = EmbyApi.GetUsers(s.FullUri, s.ApiKey);
+                var allUsers = users?.Where(x => !string.IsNullOrEmpty(x.Name));
+                return allUsers != null && allUsers.Any(x => x.Name.Equals(username, StringComparison.CurrentCultureIgnoreCase));
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return false;
+            }
         }
         private EmbyUser GetEmbyUser(string username, EmbySettings s)
         {
-            var users = EmbyApi.GetUsers(s.FullUri, s.ApiKey);
-            var allUsers = users?.Where(x => !string.IsNullOrEmpty(x.Name));
-            return allUsers?.FirstOrDefault(x => x.Name.Equals(username, StringComparison.CurrentCultureIgnoreCase));
+            try
+            {
+
+                var users = EmbyApi.GetUsers(s.FullUri, s.ApiKey);
+                var allUsers = users?.Where(x => !string.IsNullOrEmpty(x.Name));
+                return allUsers?.FirstOrDefault(x => x.Name.Equals(username, StringComparison.CurrentCultureIgnoreCase));
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return null;
+            }
         }