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 15ddc319accb..a0b17aaa6acb 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -290,10 +290,12 @@ public class IncProjectBuilder {
       if (context.isMake()) {
         // cleanup outputs
         final Set<String> allChunkRemovedSources = new HashSet<String>();
-        final SourceToFormMapping sourceToFormMap = context.getDataManager().getSourceToFormMap();
 
         for (Module module : chunk.getModules()) {
           final Collection<String> deletedPaths = myProjectDescriptor.fsState.getDeletedPaths(module, context.isCompilingTests());
+          if (deletedPaths.isEmpty()) {
+            continue;
+          }
           allChunkRemovedSources.addAll(deletedPaths);
 
           final String moduleName = module.getName().toLowerCase(Locale.US);
@@ -327,6 +329,7 @@ public class IncProjectBuilder {
               sourceToOutputStorage.remove(deletedSource);
             }
             // check if deleted source was associated with a form
+            final SourceToFormMapping sourceToFormMap = context.getDataManager().getSourceToFormMap();
             final String formPath = sourceToFormMap.getState(deletedSource);
             if (formPath != null) {
               final File formFile = new File(formPath);