diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java
index 205cba4291f6..eea13bf5b48d 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java
@@ -132,8 +132,10 @@ public class BuildTargetTypeState {
     BuildTargetConfiguration configuration = myConfigurations.get(target);
     if (configuration == null) {
       configuration = new BuildTargetConfiguration(target, myTargetsState);
-      myConfigurations.putIfAbsent(target, configuration);
-      configuration = myConfigurations.get(target);
+      final BuildTargetConfiguration existing = myConfigurations.putIfAbsent(target, configuration);
+      if (existing != null) {
+        configuration = existing;
+      }
     }
     return configuration;
   }