diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/java/com/android/server/net/NetworkPolicyManagerService.java
index f873b6c..5255647 100644
--- a/services/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -500,12 +500,14 @@
             if (reason == CHANGE_REASON_REMOVED) {
                 final WifiConfiguration config = intent.getParcelableExtra(
                         EXTRA_WIFI_CONFIGURATION);
-                final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
-                        removeDoubleQuotes(config.SSID));
-                synchronized (mRulesLock) {
-                    if (mNetworkPolicy.containsKey(template)) {
-                        mNetworkPolicy.remove(template);
-                        writePolicyLocked();
+                if (config.SSID != null) {
+                    final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
+                            removeDoubleQuotes(config.SSID));
+                    synchronized (mRulesLock) {
+                        if (mNetworkPolicy.containsKey(template)) {
+                            mNetworkPolicy.remove(template);
+                            writePolicyLocked();
+                        }
                     }
                 }
             }