diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10ExpressionTypeProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10ExpressionTypeProvider.kt
index 550ac367e1d..a3678efb1f4 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10ExpressionTypeProvider.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10ExpressionTypeProvider.kt
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.resolve.sam.SamConstructorDescriptor
 import org.jetbrains.kotlin.resolve.sam.getFunctionTypeForAbstractMethod
 import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.types.TypeUtils
-import org.jetbrains.kotlin.types.isError
 import org.jetbrains.kotlin.types.typeUtil.makeNullable
 
 class KtFe10ExpressionTypeProvider(
@@ -147,7 +146,7 @@ class KtFe10ExpressionTypeProvider(
             val bindingContext = analysisContext.analyze(parentExpression)
             val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, parentExpression]
             if (descriptor is CallableDescriptor) {
-                return descriptor.returnType?.takeIf { !it.isError }?.toKtType(analysisContext)
+                return descriptor.returnType?.toKtType(analysisContext)
             }
         } else if (parentExpression is KtBinaryExpressionWithTypeRHS && KtPsiUtil.isCast(parentExpression)) {
             val typeReference = parentExpression.right
@@ -171,7 +170,7 @@ class KtFe10ExpressionTypeProvider(
                             is SamConstructorDescriptor -> originalCallableDescriptor.returnTypeOrNothing
                             else -> parameterDescriptor.type
                         }
-                        return kotlinType.takeIf { !it.isError }?.toKtType(analysisContext)
+                        return kotlinType.toKtType(analysisContext)
                     }
                 }
             }
@@ -179,7 +178,7 @@ class KtFe10ExpressionTypeProvider(
 
         val bindingContext = analysisContext.analyze(ktExpression)
         val kotlinType = bindingContext[BindingContext.EXPECTED_EXPRESSION_TYPE, ktExpression]
-        return kotlinType?.takeIf { !it.isError }?.toKtType(analysisContext)
+        return kotlinType?.toKtType(analysisContext)
     }
 
     private fun getContainingCallExpression(argument: KtValueArgument): KtCallExpression? {
diff --git a/analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithoutExplicitType.descriptors.txt b/analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithoutExplicitType.descriptors.txt
deleted file mode 100644
index 53684a9cf4e..00000000000
--- a/analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithoutExplicitType.descriptors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-expression: av
-expected type: null
diff --git a/analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithoutExplicitType.descriptors.txt b/analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithoutExplicitType.descriptors.txt
deleted file mode 100644
index 53684a9cf4e..00000000000
--- a/analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithoutExplicitType.descriptors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-expression: av
-expected type: null