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 304f50e0937..885933a7ea3 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
@@ -74,12 +74,8 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
         if (element != null) {
             if (!canBeReferenceTo(element)) return false
 
-            val extensions = Extensions.getArea(element.getProject()).getExtensionPoint(SimpleNameReferenceExtension.EP_NAME).getExtensions()
-            for (extension in extensions) {
-                val value = extension.isReferenceTo(this, element)
-                if (value != null) {
-                    return value
-                }
+            for (extension in Extensions.getArea(element.project).getExtensionPoint(SimpleNameReferenceExtension.EP_NAME).extensions) {
+                if (extension.isReferenceTo(this, element)) return true
             }
         }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt
index 0e89d7c6622..943d054457a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt
@@ -23,9 +23,10 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 
 public interface SimpleNameReferenceExtension {
     companion object {
-        public val EP_NAME: ExtensionPointName<SimpleNameReferenceExtension> = ExtensionPointName.create("org.jetbrains.kotlin.simpleNameReferenceExtension")!!
+        public val EP_NAME: ExtensionPointName<SimpleNameReferenceExtension> =
+                ExtensionPointName.create("org.jetbrains.kotlin.simpleNameReferenceExtension")
     }
 
-    fun isReferenceTo(reference: KtSimpleNameReference, element: PsiElement): Boolean?
+    fun isReferenceTo(reference: KtSimpleNameReference, element: PsiElement): Boolean
     fun handleElementRename(reference: KtSimpleNameReference, psiFactory: KtPsiFactory, newElementName: String): PsiElement?
 }
\ No newline at end of file