diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java
index 7174f0bc872..6d8d0b094e6 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java
@@ -90,7 +90,10 @@ public class ReferenceToClassesShortening {
                         parent = parent.getContainingDeclaration();
                     }
                     JetTypeArgumentList typeArgumentList = userType.getTypeArgumentList();
-                    userType.replace(JetPsiFactory.createType(userType.getProject(), name + (typeArgumentList == null ? "" : typeArgumentList.getText())));
+                    JetTypeElement typeElement = JetPsiFactory.createType(userType.getProject(),
+                            name + (typeArgumentList == null ? "" : typeArgumentList.getText())).getTypeElement();
+                    assert typeElement != null;
+                    userType.replace(typeElement);
                 }
             });
         }