From ac59e093c176b1b8a4257a6a4c1bfd1771bc8c85 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 15 Nov 2016 13:42:48 +0100
Subject: [PATCH] IDEA-163920 NPE when saving proxy settings

---
 .../src/com/intellij/util/net/HttpConfigurable.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
index 5e6774401e6a..727d8fd5c169 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
+++ b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
@@ -633,7 +633,12 @@ public class HttpConfigurable implements PersistentStateComponent<HttpConfigurab
     return null;
   }
 
-  private void storeSecure(String key, String value) {
+  private void storeSecure(String key, @Nullable String value) {
+    if (value == null) {
+      removeSecure(key);
+      return;
+    }
+
     try {
       //PasswordSafe.getInstance().storePassword(null, HttpConfigurable.class, key, value);
       synchronized (myProxyCredentials) {