diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java
index 40be42a0bbe..248fc88b3a9 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java
@@ -196,7 +196,9 @@ public class DeclarationHintSupport extends AbstractProjectComponent {
                             try {
                                 BindingContext bindingContext =
                                         AnalyzerFacadeWithCache.analyzeFileWithCache(jetFile).getBindingContext();
-                                descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration);
+                                descriptor = bindingContext.getDiagnostics().forElement(declaration).isEmpty()
+                                             ? bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration)
+                                             : null;
                             }
                             finally {
                                 // Back to GUI thread for submitting result