diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt
index 5e752a11391..537f3ec5971 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt
@@ -33,6 +33,7 @@ class CtSymDirectoryContainer(
             when {
                 child.isDirectory -> {
                     val childPackage = if (currentPackage.isEmpty()) child.name else currentPackage + "." + child.name
+                    var addingEntry: CtSymDirectoryContainer? = null
                     if (skipPackageCheck || packages.contains(childPackage)) {
                         containers.getOrPut(childPackage) {
                             val list = mutableListOf<VirtualFile>()
@@ -43,9 +44,10 @@ class CtSymDirectoryContainer(
                                 childPackage,
                                 moduleRoot,
                                 skipPackageCheck
-                            ) to list
-                        }.also { it.second.add(child) }.first
-                    } else null
+                            ).also { addingEntry = it } to list
+                        }.also { it.second.add(child) }
+                    }
+                    addingEntry
                 }
                 isExported -> CtSymClassVirtualFile(this, child)
                 else -> null