diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
index c349daa3c95..23df1f27e61 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
@@ -256,7 +256,7 @@ public class JetPsiFactory {
 
     @NotNull
     public static JetBinaryExpression createBinaryExpression(Project project, @Nullable JetExpression lhs, @NotNull String op, @Nullable JetExpression rhs) {
-        return createBinaryExpression(project, lhs != null ? lhs.getText() : "", op, rhs != null ? rhs.getText() : "");
+        return createBinaryExpression(project, JetPsiUtil.getText(lhs), op, JetPsiUtil.getText(rhs));
     }
 
     public static JetTypeCodeFragment createTypeCodeFragment(Project project, String text, PsiElement context) {
@@ -274,7 +274,7 @@ public class JetPsiFactory {
 
     @NotNull
     public static JetReturnExpression createReturn(Project project, @Nullable JetExpression expression) {
-        return createReturn(project, expression != null ? expression.getText() : "");
+        return createReturn(project, JetPsiUtil.getText(expression));
     }
 
     @NotNull
@@ -316,7 +316,7 @@ public class JetPsiFactory {
 
         @NotNull
         public IfChainBuilder elseBranch(@Nullable JetExpression expression) {
-            return elseBranch(expression != null ? expression.getText() : "");
+            return elseBranch(JetPsiUtil.getText(expression));
         }
 
         @NotNull
@@ -364,7 +364,7 @@ public class JetPsiFactory {
 
         @NotNull
         public WhenBuilder condition(@Nullable JetExpression expression) {
-            return condition(expression != null ? expression.getText() : "");
+            return condition(JetPsiUtil.getText(expression));
         }
 
         @NotNull
@@ -374,7 +374,7 @@ public class JetPsiFactory {
 
         @NotNull
         public WhenBuilder pattern(@Nullable JetTypeReference typeReference, boolean negated) {
-            return pattern(typeReference != null ? typeReference.getText() : "", negated);
+            return pattern(JetPsiUtil.getText(typeReference), negated);
         }
 
         @NotNull
@@ -384,7 +384,7 @@ public class JetPsiFactory {
 
         @NotNull
         public WhenBuilder range(@Nullable JetExpression argument, boolean negated) {
-            return range(argument != null ? argument.getText() : "", negated);
+            return range(JetPsiUtil.getText(argument), negated);
         }
 
         @NotNull
@@ -400,7 +400,7 @@ public class JetPsiFactory {
 
         @NotNull
         public WhenBuilder branchExpression(@Nullable JetExpression expression) {
-            return branchExpression(expression != null ? expression.getText() : "");
+            return branchExpression(JetPsiUtil.getText(expression));
         }
 
         @NotNull
@@ -415,7 +415,7 @@ public class JetPsiFactory {
 
         @NotNull
         public WhenBuilder entry(@Nullable JetWhenEntry whenEntry) {
-            return entry(whenEntry != null ? whenEntry.getText() : "");
+            return entry(JetPsiUtil.getText(whenEntry));
         }
 
         @NotNull
@@ -425,7 +425,7 @@ public class JetPsiFactory {
 
         @NotNull
         public WhenBuilder elseEntry(@Nullable JetExpression expression) {
-            return elseEntry(expression != null ? expression.getText() : "");
+            return elseEntry(JetPsiUtil.getText(expression));
         }
 
         @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUnparsingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUnparsingUtils.java
index ed3b8a7adfe..e3d86c3f0f0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUnparsingUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUnparsingUtils.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.psi;
 
+import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -26,8 +27,8 @@ public class JetPsiUnparsingUtils {
     @NotNull
     public static String toIf(@Nullable JetExpression condition, @Nullable JetExpression thenExpression, @Nullable JetExpression elseExpression) {
         return toIf(
-                condition != null ? condition.getText() : "",
-                thenExpression != null ? thenExpression.getText() : "",
+                JetPsiUtil.getText(condition),
+                JetPsiUtil.getText(thenExpression),
                 elseExpression != null ? elseExpression.getText() : null
         );
     }
@@ -39,7 +40,7 @@ public class JetPsiUnparsingUtils {
 
     @NotNull
     public static String toBinaryExpression(@Nullable JetExpression left, @NotNull String op, @Nullable JetElement right) {
-        return toBinaryExpression(left != null ? left.getText() : "", op, right != null ? right.getText() : "");
+        return toBinaryExpression(JetPsiUtil.getText(left), op, JetPsiUtil.getText(right));
     }
 
     @NotNull
@@ -49,9 +50,8 @@ public class JetPsiUnparsingUtils {
 
     @NotNull
     public static String parenthesizeIfNeeded(@Nullable JetExpression expression) {
-        if (expression == null) return "";
+        String text = JetPsiUtil.getText(expression);
 
-        String text = expression.getText();
         return (expression instanceof JetParenthesizedExpression ||
                 expression instanceof JetConstantExpression ||
                 expression instanceof JetSimpleNameExpression)
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index cb9fa86166f..865bcc2622d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -40,7 +40,6 @@ import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.jet.util.QualifiedNamesUtil;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -718,4 +717,9 @@ public class JetPsiUtil {
             return true;
         }
     };
+
+    @NotNull
+    public static String getText(@Nullable PsiElement element) {
+        return element != null ? element.getText() : "";
+    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/IfWhenUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/IfWhenUtils.java
index 92d1562ebe6..b0a9ec4aa07 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/IfWhenUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/IfWhenUtils.java
@@ -154,7 +154,7 @@ public class IfWhenUtils {
                 builder.elseBranch(branch);
             } else {
                 String branchConditionText = combineWhenConditions(entry.getConditions(), whenExpression.getSubjectExpression());
-                builder.ifBranch(branchConditionText, branch != null ? branch.getText() : "");
+                builder.ifBranch(branchConditionText, JetPsiUtil.getText(branch));
             }
         }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java
index 5037371dee7..8f97f83b2cf 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java
@@ -188,7 +188,7 @@ public class WhenUtils {
         if (subject != null) {
             return toBinaryExpression(parenthesizeIfNeeded(subject), "==", parenthesizeIfNeeded(conditionExpression));
         }
-        return conditionExpression != null ? conditionExpression.getText() : "";
+        return JetPsiUtil.getText(conditionExpression);
     }
 
     @NotNull