1 files changed, 11 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index 71a0e149..ae07bc25 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -70,14 +70,18 @@ public final class Provider implements Parcelable {
         this.mainUrl.setUrl(mainUrl);
     }
 
-    public Provider(URL mainUrl, String caCert,  /*String certificatePin,*/ String definition) {
+    public Provider(URL mainUrl, String caCert, String definition) {
         this.mainUrl.setUrl(mainUrl);
-        this.caCert = caCert;
-        try {
-            this.definition = new JSONObject(definition);
-            parseDefinition(this.definition);
-        } catch (JSONException e) {
-            e.printStackTrace();
+        if (caCert != null) {
+            this.caCert = caCert;
+        }
+        if (definition != null) {
+            try {
+                this.definition = new JSONObject(definition);
+                parseDefinition(this.definition);
+            } catch (JSONException | NullPointerException e) {
+                e.printStackTrace();
+            }
         }
 
     }