diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 57b84205f8..ef77e78882 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -739,8 +739,10 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                 }
 
                 String json = data.toString();
-                if (!json.startsWith("{") || !json.endsWith("}"))
-                    throw new BadPaddingException("JSON");
+                if (!json.startsWith("{") || !json.endsWith("}")) {
+                    Log.i("Invalid JSON");
+                    throw new IllegalArgumentException(context.getString(R.string.title_setup_password_invalid));
+                }
 
                 Log.i("Importing data");
                 JSONObject jimport = new JSONObject(json);