diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
index 0a7794a19e..ca6fc2851f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
@@ -121,9 +121,10 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
 
         Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT_2);
         List<ResolveInfo> ris = pm.queryIntentServices(intent, 0); // package whitelisted
-        for (ResolveInfo ri : ris)
-            if (ri.serviceInfo != null)
-                openPgpProvider.add(ri.serviceInfo.packageName);
+        if (ris != null)
+            for (ResolveInfo ri : ris)
+                if (ri.serviceInfo != null)
+                    openPgpProvider.add(ri.serviceInfo.packageName);
 
         ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, android.R.id.text1);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 209d817322..74430094b8 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -453,7 +453,7 @@ public class Helper {
         intent.setPackage(provider);
         List<ResolveInfo> ris = pm.queryIntentServices(intent, 0);
 
-        return (ris.size() > 0);
+        return (ris != null && ris.size() > 0);
     }
 
     // View