diff --git a/src/Android/Services/KeyStoreBackedStorageService.cs b/src/Android/Services/KeyStoreBackedStorageService.cs
index 3fada905e..78bf5db61 100644
--- a/src/Android/Services/KeyStoreBackedStorageService.cs
+++ b/src/Android/Services/KeyStoreBackedStorageService.cs
@@ -81,7 +81,8 @@ namespace Bit.Android.Services
             {
                 Console.WriteLine("Failed to decrypt from secure storage.");
                 _settings.Remove(formattedKey);
-                return null;
+                throw;
+                //return null;
             }
         }
 
@@ -109,6 +110,7 @@ namespace Bit.Android.Services
             catch
             {
                 Console.WriteLine("Failed to encrypt to secure storage.");
+                throw;
             }
         }
 
@@ -190,7 +192,8 @@ namespace Bit.Android.Services
                 Console.WriteLine("Cannot get AesKey.");
                 _keyStore.DeleteEntry(KeyAlias);
                 _settings.Remove(AesKey);
-                return null;
+                throw;
+                //return null;
             }
         }