diff --git a/platform/configuration-store-impl/src/StateMap.kt b/platform/configuration-store-impl/src/StateMap.kt
index 54e94df82ebb..2941b890e314 100644
--- a/platform/configuration-store-impl/src/StateMap.kt
+++ b/platform/configuration-store-impl/src/StateMap.kt
@@ -203,7 +203,7 @@ class StateMap private constructor(private val names: Array<String>, private val
     }
 
     val currentState = states.get(index)
-    LOG.assertTrue(currentState is Element)
+    LOG.assertTrue(currentState is Element, currentState?.let { it.javaClass.name } ?: "null")
     states.set(index, if (state == null) null else archiveState(state).toByteArray())
   }
 }
diff --git a/platform/configuration-store-impl/src/StorageBaseEx.kt b/platform/configuration-store-impl/src/StorageBaseEx.kt
index 72ed7d7cd8a8..bdc7ce320f03 100644
--- a/platform/configuration-store-impl/src/StorageBaseEx.kt
+++ b/platform/configuration-store-impl/src/StorageBaseEx.kt
@@ -56,7 +56,7 @@ class StateGetter<S : Any, T : Any>(private val component: PersistentStateCompon
     try {
       stateAfterLoad = component.state
     }
-    catch(e: Throwable) {
+    catch (e: Throwable) {
       LOG.error("Cannot get state after load", e)
       stateAfterLoad = null
     }
diff --git a/platform/configuration-store-impl/src/XmlElementStorage.kt b/platform/configuration-store-impl/src/XmlElementStorage.kt
index ceedbe8741e8..f0b2854718e6 100644
--- a/platform/configuration-store-impl/src/XmlElementStorage.kt
+++ b/platform/configuration-store-impl/src/XmlElementStorage.kt
@@ -226,7 +226,7 @@ fun save(states: StateMap, rootElementName: String, newLiveStates: Map<String, E
   return rootElement
 }
 
-fun Element.normalizeRootName(): Element {
+internal fun Element.normalizeRootName(): Element {
   if (parent != null) {
     LOG.warn("State element must not have parent ${JDOMUtil.writeElement(this)}")
     detach()