diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantExpressionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantExpressionPredicate.java
index ad2ce95af9fc..fad82cd3fa2d 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantExpressionPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantExpressionPredicate.java
@@ -32,8 +32,7 @@ class ConstantExpressionPredicate implements PsiElementPredicate {
     }
     final PsiPolyadicExpression expression = (PsiPolyadicExpression)element;
     final PsiType expressionType = expression.getType();
-    if (expressionType == null) return false;
-    if (expressionType.equalsToText("java.lang.String")) {
+    if (expressionType == null || expressionType.equalsToText("java.lang.String")) {
       // intention disabled for string concatenations because of performance issues on
       // relatively common large string expressions.
       return false;
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java
index 02d111224d3b..77be61f4118b 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java
@@ -73,10 +73,10 @@ class ConstantSubexpressionPredicate implements PsiElementPredicate {
       if (currentToken == token) {
         final String binaryExpressionText = operands[i - 1].getText() + ' ' + token.getText() + ' ' + operand.getText();
         final PsiElementFactory factory = JavaPsiFacade.getElementFactory(expression.getProject());
-        return (PsiBinaryExpression)factory.createExpressionFromText(binaryExpressionText, expression);
+        return (PsiPolyadicExpression)factory.createExpressionFromText(binaryExpressionText, expression);
       }
     }
-    return null;
+    throw new AssertionError();
   }
 
   private static boolean isPartOfLargerExpression(PsiPolyadicExpression expression) {