diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index a6da3d85e8..f991a8e13a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -295,7 +295,12 @@ public class FragmentOAuth extends FragmentBase {
             AuthorizationRequest authRequest = authRequestBuilder.build();
 
             Log.i("OAuth request provider=" + provider.id + " uri=" + authRequest.toUri());
-            Intent authIntent = authService.getAuthorizationRequestIntent(authRequest);
+            Intent authIntent = null;
+            try {
+                authIntent = authService.getAuthorizationRequestIntent(authRequest);
+            } catch (ActivityNotFoundException ex) {
+                throw new ActivityNotFoundException("Browser not found");
+            }
             PackageManager pm = getContext().getPackageManager();
             if (authIntent.resolveActivity(pm) == null) // action whitelisted
                 throw new ActivityNotFoundException(authIntent.toString());