diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index 3f134d98b15..c6324c7dc37 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -105,12 +105,13 @@ class ResolverForProjectImpl<M : ModuleInfo>(
 
     private class ModuleData(
         val moduleDescriptor: ModuleDescriptorImpl,
-        val modificationTracker: ModificationTracker?,
-        val modificationCount: Long?
+        val modificationTracker: ModificationTracker?
     ) {
+        val modificationCount: Long = modificationTracker?.modificationCount ?: Long.MIN_VALUE
+
         fun isOutOfDate(): Boolean {
             val currentModCount = modificationTracker?.modificationCount
-            return currentModCount != null && currentModCount > modificationCount!!
+            return currentModCount != null && currentModCount > modificationCount
         }
     }
 
@@ -263,7 +264,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
         setupModuleDescriptor(module, moduleDescriptor)
         val modificationTracker = (module as? TrackableModuleInfo)?.createModificationTracker()
                 ?: (PsiModificationTracker.SERVICE.getInstance(projectContext.project).outOfCodeBlockModificationTracker.takeIf { invalidateOnOOCB })
-        return ModuleData(moduleDescriptor, modificationTracker, modificationTracker?.modificationCount)
+        return ModuleData(moduleDescriptor, modificationTracker)
     }
 }