diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java
index cb4b72a2ea7..81ebebd704a 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java
@@ -254,11 +254,10 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport
                         JetDeclaration jetDeclaration = (JetDeclaration) key;
                         if (!JetPsiUtil.isLocal(jetDeclaration)) {
                             kotlinCodeAnalyzer.resolveToDescriptor(jetDeclaration);
+                            return super.get(slice, key);
                         }
                     }
                 }
-
-                return super.get(slice, key);
             }
 
             return value;