diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java
index 13caaa68f92a..708e00c3778a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java
@@ -93,7 +93,7 @@ public class GroovyScriptClass extends LightElement implements GrMemberOwner, Sy
   }
 
   public boolean isValid() {
-    return myFile.isValid() && myFile.getTopStatements().length > 0;
+    return myFile.isValid() && myFile.isScript();
   }
 
   @NotNull
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
index 26fb96615452..7c603f739108 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
@@ -18,13 +18,10 @@ package org.jetbrains.plugins.groovy.completion;
 
 
 import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiFile
+import org.jetbrains.plugins.groovy.GroovyFileType
 import org.jetbrains.plugins.groovy.util.TestUtils
 
-import org.jetbrains.plugins.groovy.GroovyFileType
-
-/**
+ /**
  * @author Maxim.Medvedev
  */
 public class GroovyCompletionTest extends GroovyCompletionTestBase {
@@ -395,5 +392,12 @@ format<caret>"""
     myFixture.type 'lan\n'
     myFixture.checkResult "import java.lang<caret>"
   }
-  
+
+  public void testInvalidScriptClass() {
+    myFixture.addFileToProject("b.groovy", "//comment")
+    myFixture.configureByText "a.groovy", "def b<caret>"
+    myFixture.completeBasic()
+    myFixture.checkResult "def b<caret>"
+  }
+
 }
\ No newline at end of file