diff --git a/src/App/Services/CryptoService.cs b/src/App/Services/CryptoService.cs
index a9d8794bc..6c4a2d4b0 100644
--- a/src/App/Services/CryptoService.cs
+++ b/src/App/Services/CryptoService.cs
@@ -94,7 +94,7 @@ namespace Bit.App.Services
             {
                 if(Key == null)
                 {
-                    throw new InvalidOperationException("Key must be set before asking if it has changed.");
+                    return false;
                 }
 
                 if(PreviousKey == null)
diff --git a/src/App/Services/SettingsService.cs b/src/App/Services/SettingsService.cs
index 438429dd1..2352725d1 100644
--- a/src/App/Services/SettingsService.cs
+++ b/src/App/Services/SettingsService.cs
@@ -27,7 +27,7 @@ namespace Bit.App.Services
             var settings = await _settingsRepository.GetByIdAsync(_authService.UserId);
             if(string.IsNullOrWhiteSpace(settings?.EquivalentDomains))
             {
-                return null;
+                return new List<string[]>();
             }
 
             return JsonConvert.DeserializeObject<IEnumerable<IEnumerable<string>>>(settings.EquivalentDomains);