Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_design

1 files changed, 3 insertions, 1 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
index 3713e198..741a6f56 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
@@ -304,6 +304,8 @@ public class ConfigHelper {
             } catch (JSONException e2) {
                 return null;
             }
+        } catch (NullPointerException npe) {
+            return null;
         }
     }
 
@@ -322,7 +324,7 @@ public class ConfigHelper {
         try {
             JSONObject providerJson = new JSONObject(provider);
             return providerJson.getString(Provider.DOMAIN);
-        } catch (JSONException e) {
+        } catch (JSONException | NullPointerException e) {
             return null;
         }
     }