diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt
index bf2a1513bc0..34080d638d9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt
@@ -60,8 +60,9 @@ private val getRelatedProductionModule: (Module) -> Module? = run {
     }
 
     return@run { module ->
-        val instance = getInstanceMethod(null, module)
-        getProductionModuleMethod(instance) as Module?
+        getInstanceMethod(null, module)?.let {
+            getProductionModuleMethod(it) as Module?
+        }
     }
 }
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt
index a87bb0a6f92..e4089a34907 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt
@@ -63,8 +63,9 @@ object KotlinBuilderModuleScriptGenerator {
         }
 
         return@run { module ->
-            val instance = getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module)
-            getProductionModuleMethod(instance) as JpsModule?
+            getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module)?.let {
+                getProductionModuleMethod(it) as JpsModule?
+            }
         }
     }