diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
index c6d7611c75af..0dcb61f2251d 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
@@ -249,9 +249,7 @@ public class TypeMigrationLabeler {
   public void migrateExpressionType(final PsiExpression expr, final PsiType migrationType, final PsiElement place, boolean alreadyProcessed, final boolean isCovariant) {
     PsiType originalType = expr.getType();
 
-    LOG.assertTrue(originalType != null);
-
-    if (originalType.equals(migrationType)) return;
+    if (originalType == null || originalType.equals(migrationType)) return;
 
     if (originalType.equals(PsiType.NULL)) {
       if (migrationType instanceof PsiPrimitiveType) {
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/rules/RootTypeConversionRule.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/rules/RootTypeConversionRule.java
index 37920f4583cc..c32b873207fa 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/rules/RootTypeConversionRule.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/rules/RootTypeConversionRule.java
@@ -85,7 +85,7 @@ public class RootTypeConversionRule extends TypeConversionRule {
               }
 
               if (!originalType.equals(type)) {
-                labeler.migrateExpressionType(actualParams[i], methodTypeParamsSubstitutor.substitute(type), context, originalType.equals(type), true);
+                labeler.migrateExpressionType(actualParams[i], methodTypeParamsSubstitutor.substitute(type), context, false, true);
               }
             }
           }