diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index 7f0056050..bf9971013 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -70,7 +70,10 @@ public class WifiStateChangeService extends Service {
                         (ipAddress >> 16 & 0xff),
                         (ipAddress >> 24 & 0xff));
 
-                FDroidApp.ssid = wifiInfo.getSSID().replaceAll("^\"(.*)\"$", "$1");
+                FDroidApp.ssid = wifiInfo.getSSID();
+                if (FDroidApp.ssid != null) {
+                    FDroidApp.ssid.replaceAll("^\"(.*)\"$", "$1");
+                }
                 FDroidApp.bssid = wifiInfo.getBSSID();
 
                 String scheme;