8797 - pair programming effort

1 files changed, 6 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
index 197a080b..03dd9d05 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
@@ -48,12 +48,16 @@ public class VpnCertificateValidator {
             return false;
         }
 
-        X509Certificate certificate_x509 = ConfigHelper.parseX509CertificateFromString(certificate);
-        return isValid(certificate_x509);
+        X509Certificate x509Certificate = ConfigHelper.parseX509CertificateFromString(certificate);
+        return isValid(x509Certificate);
     }
 
 
     private boolean isValid(X509Certificate certificate) {
+        if (certificate == null) {
+            return false;
+        }
+
         Calendar offsetDate = calculateOffsetCertificateValidity(certificate);
         try {
             certificate.checkValidity(offsetDate.getTime());