diff --git a/platform/util/src/com/intellij/openapi/util/registry/Registry.java b/platform/util/src/com/intellij/openapi/util/registry/Registry.java
index 32e2e4fe7f13..89c60b09f70c 100644
--- a/platform/util/src/com/intellij/openapi/util/registry/Registry.java
+++ b/platform/util/src/com/intellij/openapi/util/registry/Registry.java
@@ -157,7 +157,13 @@ public class Registry  {
     Map<String, String> old = new HashMap<String, String>();
     old.putAll(myUserProperties);
     for (String each : old.keySet()) {
-      get(each).resetToDefault();      
+      try {
+        get(each).resetToDefault();
+      }
+      catch (MissingResourceException e) {
+        // outdated property that is not declared in registry.properties anymore
+        myValues.remove(each);
+      }
     }
   }