diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt
index 1d0d30e4677..a60d0a59236 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt
@@ -168,11 +168,7 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
 
     override fun getClasses(): Array<PsiClass> {
         val fileClassProvider = ServiceManager.getService(project, KtFileClassProvider::class.java)
-        // TODO We don't currently support finding light classes for scripts
-        return if (fileClassProvider != null && !isScript()) {
-            fileClassProvider.getFileClasses(this)
-        }
-        else PsiClass.EMPTY_ARRAY
+        return fileClassProvider?.getFileClasses(this) ?: PsiClass.EMPTY_ARRAY
     }
 
     override fun setPackageName(packageName: String) {}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index c77895c6e36..87d59f6f284 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -342,8 +342,9 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
 
 class KtFileClassProviderImpl(val lightClassGenerationSupport: LightClassGenerationSupport) : KtFileClassProvider {
     override fun getFileClasses(file: KtFile): Array<PsiClass> {
-        if (file.isCompiled) {
-            return arrayOf()
+        // TODO We don't currently support finding light classes for scripts
+        if (file.isCompiled || file.isScript()) {
+            return PsiClass.EMPTY_ARRAY
         }
 
         val result = arrayListOf<PsiClass>()