diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index bc58855d41d5..07f0f1b551e2 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -380,11 +380,9 @@ public class IncProjectBuilder {
   private static void createClasspathIndex(final ModuleChunk chunk, boolean forTests) {
     final Set<File> outputPaths = new LinkedHashSet<File>();
     for (Module module : chunk.getModules()) {
-      if (forTests) {
-        outputPaths.add(new File(module.getTestOutputPath()));
-      }
-      else {
-        outputPaths.add(new File(module.getOutputPath()));
+      final String out = forTests? module.getTestOutputPath() : module.getOutputPath();
+      if (out != null) {
+        outputPaths.add(new File(out));
       }
     }
     for (File outputRoot : outputPaths) {