diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index a461e67e7..643a7b7ef 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -15,7 +15,6 @@ using Xamarin.Forms;
 using System.Threading.Tasks;
 using Bit.App.Models.Page;
 using Bit.App;
-using Android.Runtime;
 
 namespace Bit.Android
 {
@@ -30,8 +29,6 @@ namespace Bit.Android
 
         protected override void OnCreate(Bundle bundle)
         {
-            AndroidEnvironment.UnhandledExceptionRaiser += AndroidEnvironment_UnhandledExceptionRaiser;
-
             var uri = Intent.GetStringExtra("uri");
             if(!Resolver.IsSet)
             {
@@ -107,12 +104,6 @@ namespace Bit.Android
             });
         }
 
-        private void AndroidEnvironment_UnhandledExceptionRaiser(object sender, RaiseThrowableEventArgs e)
-        {
-            var message = Utilities.AppendExceptionToMessage("", e.Exception);
-            Utilities.SendCrashEmail(this, e.Exception, true);
-        }
-
         private void ReturnCredentials(VaultListPageModel.Login login)
         {
             Intent data = new Intent();
diff --git a/src/Android/MainApplication.cs b/src/Android/MainApplication.cs
index a2f9c9138..4b3092e64 100644
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -24,9 +24,9 @@ using SimpleInjector;
 namespace Bit.Android
 {
 #if DEBUG
-    //[Application(Debuggable = true)]
+    [Application(Debuggable = true)]
 #else
-    //[Application(Debuggable = false)]
+    [Application(Debuggable = false)]
 #endif
     public class MainApplication : Application, Application.IActivityLifecycleCallbacks
     {
@@ -197,20 +197,10 @@ namespace Bit.Android
             container.RegisterSingleton(application.ApplicationContext);
             container.RegisterSingleton<Application>(application);
 
-            ISecureStorageService secureStorage;
-            try
-            {
-                secureStorage = new AndroidKeyStoreStorageService(CrossSettings.Current);
-            }
-            catch
-            {
-                secureStorage = new KeyStoreStorageService(new char[] { });
-            }
-
             // Services
             container.RegisterSingleton<IDatabaseService, DatabaseService>();
             container.RegisterSingleton<ISqlService, SqlService>();
-            container.RegisterSingleton(secureStorage);
+            container.RegisterSingleton<ISecureStorageService, AndroidKeyStoreStorageService>();
             container.RegisterSingleton<ICryptoService, CryptoService>();
             container.RegisterSingleton<IKeyDerivationService, BouncyCastleKeyDerivationService>();
             container.RegisterSingleton<IAuthService, AuthService>();