diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
index 4e129bcbb25..38f31402254 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
@@ -49,8 +49,8 @@ abstract class AbstractKtReference<T : KtElement>(element: T) : PsiPolyVariantRe
         return ResolveCache.getInstance(expression.project).resolveWithCaching(this, kotlinResolver, false, incompleteCode)
     }
 
-    override fun isReferenceTo(element: PsiElement?): Boolean {
-        return element != null && matchesTarget(element)
+    override fun isReferenceTo(element: PsiElement): Boolean {
+        return matchesTarget(element)
     }
 
     override fun getCanonicalText(): String = "<TBD>"
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
index eb0f15bcb11..0980d267dbe 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
@@ -75,13 +75,11 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
         }
     }
 
-    override fun isReferenceTo(element: PsiElement?): Boolean {
-        if (element != null) {
-            if (!canBeReferenceTo(element)) return false
+    override fun isReferenceTo(element: PsiElement): Boolean {
+        if (!canBeReferenceTo(element)) return false
 
-            for (extension in Extensions.getArea(element.project).getExtensionPoint(SimpleNameReferenceExtension.EP_NAME).extensions) {
-                if (extension.isReferenceTo(this, element)) return true
-            }
+        for (extension in Extensions.getArea(element.project).getExtensionPoint(SimpleNameReferenceExtension.EP_NAME).extensions) {
+            if (extension.isReferenceTo(this, element)) return true
         }
 
         return super.isReferenceTo(element)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
index 75e615ef535..66cf1adb200 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
@@ -56,7 +56,7 @@ sealed class SyntheticPropertyAccessorReference(expression: KtNameReferenceExpre
         return result
     }
 
-    override fun isReferenceTo(element: PsiElement?): Boolean {
+    override fun isReferenceTo(element: PsiElement): Boolean {
         if (element !is PsiMethod || !isAccessorName(element.name)) return false
         if (!getter && expression.readWriteAccess(true) == ReferenceAccess.READ) return false
         return super.isReferenceTo(element)