diff --git a/platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java b/platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java
index 8d04bd4e6e0b..83792924d8aa 100644
--- a/platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java
@@ -89,7 +89,8 @@ public class ComponentConfig {
   }
 
   public void setHeadlessImplementationClass(String headlessImplementationClass) {
-    this.headlessImplementationClass = headlessImplementationClass == null ? null : headlessImplementationClass.trim();
+    headlessImplementationClass = headlessImplementationClass == null ? null : headlessImplementationClass.trim();
+    this.headlessImplementationClass = headlessImplementationClass == null ? null : StringUtil.isEmpty(headlessImplementationClass) ? "" : headlessImplementationClass;
   }
 
   public void setLoadForDefaultProject(boolean loadForDefaultProject) {
diff --git a/platform/util/src/com/intellij/openapi/util/registry/RegistryValue.java b/platform/util/src/com/intellij/openapi/util/registry/RegistryValue.java
index b1096e6626a7..076e298aa218 100644
--- a/platform/util/src/com/intellij/openapi/util/registry/RegistryValue.java
+++ b/platform/util/src/com/intellij/openapi/util/registry/RegistryValue.java
@@ -111,9 +111,12 @@ public class RegistryValue {
       if (myStringCachedValue == null) {
         myStringCachedValue = _get(key, defaultValue, isValue);
       }
-
+      if (isBoolean()) {
+        myStringCachedValue = Boolean.valueOf(myStringCachedValue).toString();
+      }
       return myStringCachedValue;
-    } else {
+    }
+    else {
       return _get(key, defaultValue, isValue);
     }
   }