diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java
index 0a76c537f070..fdbe00e70939 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java
@@ -70,15 +70,8 @@ public class ControlFlowOptions {
    * @see #shouldEvaluateConstantIfCondition() 
    */
   public ControlFlowOptions dontEvaluateConstantIfCondition() {
-    if (myEvaluateConstantIfCondition) {
-      if (!myOnlyExplicitExceptions) {
-        return create(myEnableShortCircuit, false, myExceptionAfterAssignment);
-      }
-      else {
-        return new ControlFlowOptions(myEnableShortCircuit, false, myExceptionAfterAssignment, myOnlyExplicitExceptions);
-      }
-    }
-    return this;
+    return myEvaluateConstantIfCondition ?
+           create(myEnableShortCircuit, false, myExceptionAfterAssignment) : this;
   }
 
   @Override