From 2a3c4e6b9365171472c65865274ee1bd76fedd24 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 18 Dec 2019 17:54:52 +0100
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/MailService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index 31dc2583a4..4b66e2ac66 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -348,7 +348,8 @@ public class MailService implements AutoCloseable {
             } else
                 throw new NoSuchProviderException(protocol);
         } catch (MessagingException ex) {
-            if (ex.getCause() instanceof SSLHandshakeException &&
+            if (factory != null &&
+                    ex.getCause() instanceof SSLHandshakeException &&
                     ex.getCause().getCause() instanceof CertificateException)
                 throw new UntrustedException(factory.getFingerPrint(), ex);
             else