diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/GroovyImportOptimizer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/GroovyImportOptimizer.java
index 8f1db065ceec..ab1e56a5d8fc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/GroovyImportOptimizer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/GroovyImportOptimizer.java
@@ -16,6 +16,7 @@
 package org.jetbrains.plugins.groovy.lang.editor;
 
 import com.intellij.lang.ImportOptimizer;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
@@ -75,6 +76,11 @@ public class GroovyImportOptimizer implements ImportOptimizer {
     }
 
     public void run() {
+      final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(myFile.getProject());
+      final Document document = documentManager.getDocument(myFile);
+      if (document != null) {
+        documentManager.commitDocument(document);
+      }
       final Set<String> importedClasses = new LinkedHashSet<String>();
       final Set<String> staticallyImportedMembers = new LinkedHashSet<String>();
       final Set<GrImportStatement> usedImports = new HashSet<GrImportStatement>();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
index 74ce1e824592..a9c71d6d9967 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
@@ -69,7 +69,7 @@ public abstract class GroovyPsiElementFactory {
    * @param alias
    * @return import statement for given class
    */
-  public abstract GrImportStatement createImportStatementFromText(String qName, boolean isStatic, boolean isOnDemand, String alias);
+  public abstract GrImportStatement createImportStatementFromText(String qName, boolean isStatic, boolean isOnDemand, @Nullable String alias);
 
   public abstract GrImportStatement createImportStatementFromText(String text);