diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
index 81592affda5e..2a01f0f6ed23 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
@@ -84,7 +84,7 @@ class BuildTasksImpl extends BuildTasks {
 
   @Override
   void buildSearchableOptions(String targetModuleName, List<String> modulesToIndex, List<String> pathsToLicenses) {
-    buildSearchableOptions(new File(buildContext.projectBuilder.moduleOutput(buildContext.findModule(targetModuleName))), modulesToIndex, pathsToLicenses)
+    buildSearchableOptions(new File(buildContext.projectBuilder.moduleOutput(buildContext.findRequiredModule(targetModuleName))), modulesToIndex, pathsToLicenses)
   }
 
 //todo[nik] do we need 'cp' and 'jvmArgs' parameters?
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
index 9df697b418b8..b7608e18ff81 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
@@ -146,7 +146,8 @@ class DistributionJARsBuilder {
 
   List<String> getPlatformModules() {
     (platform.moduleJars.values() as List<String>) +
-    ["java-runtime" /*required to build searchable options index*/, "updater"]
+    ["java-runtime", "platform-main", /*required to build searchable options index*/
+     "updater", buildContext.productProperties.productLayout.mainModule]
 
   }