diff --git a/src/App/Pages/Vault/AddEditPageViewModel.cs b/src/App/Pages/Vault/AddEditPageViewModel.cs
index 8db051bd7..1323478b7 100644
--- a/src/App/Pages/Vault/AddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/AddEditPageViewModel.cs
@@ -367,6 +367,10 @@ namespace Bit.App.Pages
 
         public async Task<bool> SubmitAsync()
         {
+            if(Cipher == null)
+            {
+                return false;
+            }
             if(Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
             {
                 await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
@@ -406,6 +410,10 @@ namespace Bit.App.Pages
             }
 
             var cipher = await _cipherService.EncryptAsync(Cipher);
+            if(cipher == null)
+            {
+                return false;
+            }
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.Saving);