diff --git a/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
index d3ae32aa871c..2d89a0e54b76 100644
--- a/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
+++ b/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
@@ -30,9 +30,7 @@ public class DelegatingGlobalSearchScope extends GlobalSearchScope {
   private final Object myEquality;
 
   public DelegatingGlobalSearchScope(@NotNull GlobalSearchScope baseScope) {
-    super(baseScope.getProject());
-    myBaseScope = baseScope;
-    myEquality = ArrayUtil.EMPTY_OBJECT_ARRAY;
+    this(baseScope, ArrayUtil.EMPTY_OBJECT_ARRAY);
   }
 
   public DelegatingGlobalSearchScope(@NotNull GlobalSearchScope baseScope, @NotNull Object... equality) {
diff --git a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java
index 477a04f1d549..da3f269832d7 100644
--- a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java
+++ b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java
@@ -59,7 +59,7 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope {
     myModule = module;
     myOptions = options;
 
-    myProjectFileIndex = ProjectRootManager.getInstance(getProject()).getFileIndex();
+    myProjectFileIndex = ProjectRootManager.getInstance(module.getProject()).getFileIndex();
 
     OrderEnumerator en = ModuleRootManager.getInstance(module).orderEntries();
     /*if (myIncludeOtherModules) */en.recursively();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java
index 068e96dd4cd0..00068d82237d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public class GroovyGenerationInfo<T extends PsiMember> extends PsiGenerationInfo
     final T member = getPsiMember();
     if (member == null) return;
 
-    LOG.assertTrue(member instanceof GroovyPsiElement);
+    LOG.assertTrue(member instanceof GroovyPsiElement, member);
     final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(member.getProject());
 
     final PsiElement prev = member.getPrevSibling();