diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
index cc4d1491e3a2..791908cfa842 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
@@ -288,11 +288,17 @@ public class GroovyDslFileIndex extends ScalarIndexExtension<String> {
                   if (cause instanceof ProcessCanceledException) {
                     throw (ProcessCanceledException)cause;
                   }
+                  if (cause instanceof OutOfMemoryError) {
+                    throw (OutOfMemoryError)cause;
+                  }
                   handleDslError(e, project, dslFile);
                 }
                 catch (ProcessCanceledException e) {
                   throw e;
                 }
+                catch (OutOfMemoryError e) {
+                  throw e;
+                }
                 catch (Throwable e) { // To handle exceptions in definition script
                   handleDslError(e, project, dslFile);
                 }