diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
index 7b12bc349967..67e643841567 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
@@ -200,8 +200,7 @@ public class TypeEvaluator {
                 return elseType;
 
               case 3:
-                LOG.error("Condition type conflict.");
-                return null;
+                return expr.getType();
 
               default:
                 LOG.error("Must not happen.");