diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index a8d975688b..9f59686497 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -360,7 +360,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-        outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
+        outState.putBoolean("fair:toggle", drawerToggle == null || drawerToggle.isDrawerIndicatorEnabled());
         outState.putString("fair:password", password);
         outState.putBoolean("fair:import_accounts", import_accounts);
         outState.putBoolean("fair:import_delete", import_delete);
@@ -1721,8 +1721,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
 
         @Override
         public void onSaveInstanceState(@NonNull Bundle outState) {
-            outState.putString("fair:password1", etPassword1.getEditText().getText().toString());
-            outState.putString("fair:password2", etPassword2.getEditText().getText().toString());
+            outState.putString("fair:password1", etPassword1 == null ? null : etPassword1.getEditText().getText().toString());
+            outState.putString("fair:password2", etPassword2 == null ? null : etPassword2.getEditText().getText().toString());
             super.onSaveInstanceState(outState);
         }
 
@@ -1776,7 +1776,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
 
         @Override
         public void onSaveInstanceState(@NonNull Bundle outState) {
-            outState.putString("fair:password1", etPassword1.getEditText().getText().toString());
+            outState.putString("fair:password1", etPassword1 == null ? null : etPassword1.getEditText().getText().toString());
             super.onSaveInstanceState(outState);
         }
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 48cd40abd4..4b67490538 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -740,7 +740,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         outState.putParcelable("fair:intent", getIntent());
-        outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
+        outState.putBoolean("fair:toggle", drawerToggle == null || drawerToggle.isDrawerIndicatorEnabled());
         outState.putBoolean("fair:searching", searching);
         super.onSaveInstanceState(outState);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 1f94dc2ff7..3c7a490301 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1409,10 +1409,10 @@ public class FragmentAccount extends FragmentBase {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt("fair:provider", spProvider.getSelectedItemPosition());
+        outState.putInt("fair:provider", spProvider == null ? 0 : spProvider.getSelectedItemPosition());
         outState.putString("fair:certificate", certificate);
-        outState.putString("fair:password", tilPassword.getEditText().getText().toString());
-        outState.putInt("fair:advanced", grpAdvanced.getVisibility());
+        outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
+        outState.putInt("fair:advanced", grpAuthorize == null ? View.VISIBLE : grpAdvanced.getVisibility());
         outState.putInt("fair:auth", auth);
         outState.putString("fair:authprovider", provider);
         super.onSaveInstanceState(outState);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
index 43a022fc39..892b44db2e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
@@ -41,7 +41,7 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
-        outState.putString("fair:link", etLink.getText().toString());
+        outState.putString("fair:link", etLink == null ? null : etLink.getText().toString());
         super.onSaveInstanceState(outState);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 0622d8807f..b56e2218a8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -1091,11 +1091,11 @@ public class FragmentIdentity extends FragmentBase {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt("fair:account", spAccount.getSelectedItemPosition());
-        outState.putInt("fair:provider", spProvider.getSelectedItemPosition());
+        outState.putInt("fair:account", spAccount == null ? 0 : spAccount.getSelectedItemPosition());
+        outState.putInt("fair:provider", spProvider == null ? 0 : spProvider.getSelectedItemPosition());
         outState.putString("fair:certificate", certificate);
-        outState.putString("fair:password", tilPassword.getEditText().getText().toString());
-        outState.putInt("fair:advanced", grpAdvanced.getVisibility());
+        outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
+        outState.putInt("fair:advanced", grpAdvanced == null ? View.VISIBLE : grpAdvanced.getVisibility());
         outState.putInt("fair:auth", auth);
         outState.putString("fair:authprovider", provider);
         outState.putString("fair:html", signature);
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index 4ab9b60cc6..7356f1f776 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -649,7 +649,7 @@ public class FragmentPop extends FragmentBase {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putString("fair:password", tilPassword.getEditText().getText().toString());
+        outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
         outState.putInt("fair:auth", auth);
         super.onSaveInstanceState(outState);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 3ed3ba61f7..ce182b2a4c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -108,7 +108,7 @@ public class FragmentQuickSetup extends FragmentBase {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putString("fair:password", tilPassword.getEditText().getText().toString());
+        outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
         outState.putParcelable("fair:best", bestProvider);
         outState.putParcelable("fair:args", bestArgs);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index a1c0d11296..ee81289b3b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -807,15 +807,15 @@ public class FragmentRule extends FragmentBase {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        Object tag = btnFolder.getTag();
-        outState.putInt("fair:start", spScheduleDayStart.getSelectedItemPosition());
-        outState.putInt("fair:end", spScheduleDayEnd.getSelectedItemPosition());
-        outState.putInt("fair:action", spAction.getSelectedItemPosition());
-        outState.putInt("fair:importance", spImportance.getSelectedItemPosition());
+        Object tag = (btnFolder == null ? null : btnFolder.getTag());
+        outState.putInt("fair:start", spScheduleDayStart == null ? 0 : spScheduleDayStart.getSelectedItemPosition());
+        outState.putInt("fair:end", spScheduleDayEnd == null ? 0 : spScheduleDayEnd.getSelectedItemPosition());
+        outState.putInt("fair:action", spAction == null ? 0 : spAction.getSelectedItemPosition());
+        outState.putInt("fair:importance", spImportance == null ? 0 : spImportance.getSelectedItemPosition());
         outState.putLong("fair:target", tag == null ? -1 : (long) tag);
-        outState.putCharSequence("fair:name", btnFolder.getText());
-        outState.putInt("fair:identity", spIdent.getSelectedItemPosition());
-        outState.putInt("fair:answer", spAnswer.getSelectedItemPosition());
+        outState.putCharSequence("fair:name", btnFolder == null ? null : btnFolder.getText());
+        outState.putInt("fair:identity", spIdent == null ? 0 : spIdent.getSelectedItemPosition());
+        outState.putInt("fair:answer", spAnswer == null ? 0 : spAnswer.getSelectedItemPosition());
         outState.putParcelable("fair:sound", sound);
 
         super.onSaveInstanceState(outState);