diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
index a36c2dec203ac7bccec29dd941050b403d3d1f24..dd9070af592b5a5e450d5347e9dfaae5362d6d96 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
@@ -110,7 +110,7 @@ public class ProviderManager implements AdapteeCollection<Provider> {
         this.externalFilesDir = externalFilesDir;
         customProviders = externalFilesDir != null && externalFilesDir.isDirectory() ?
                 providersFromFiles(externalFilesDir.list()) :
-                new HashSet<Provider>();
+                new HashSet<>();
         customProviderURLs = getProviderUrlSetFromProviderSet(customProviders);
     }
 
@@ -121,7 +121,7 @@ public class ProviderManager implements AdapteeCollection<Provider> {
                 String mainUrl = extractMainUrlFromInputStream(getInputStreamFrom(externalFilesDir.getAbsolutePath() + "/" + file));
                 providers.add(new Provider(new URL(mainUrl)));
             }
-        } catch (MalformedURLException | FileNotFoundException e) {
+        } catch (MalformedURLException | FileNotFoundException | NullPointerException e) {
             e.printStackTrace();
         }