diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyDummyElement.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyDummyElement.kt
index 41962af87c6d..fabcf00f91c0 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyDummyElement.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyDummyElement.kt
@@ -4,4 +4,4 @@ package org.jetbrains.plugins.groovy.lang.psi.impl
 import com.intellij.psi.impl.source.tree.FileElement
 import com.intellij.psi.tree.IElementType
 
-class GroovyDummyElement(val childType: IElementType, text: CharSequence?) : FileElement(GroovyDummyElementType, text)
+class GroovyDummyElement(val childType: IElementType, text: CharSequence) : FileElement(GroovyDummyElementType, text)
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
index cb5ca0ba103c..14f0d8e94042 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
@@ -123,7 +123,7 @@ public class GroovyPsiElementFactoryImpl extends GroovyPsiElementFactory {
     DummyHolder holder = new DummyHolder(myManager, dummyElement, context);
     PsiElement element = holder.getFirstChild();
     if (!(element instanceof GrCodeReferenceElement)) {
-      throw new IncorrectOperationException("Incorrect core reference '" + refName + "'");
+      throw new IncorrectOperationException("Incorrect code reference '" + refName + "'");
     }
     return (GrCodeReferenceElement)element;
   }