From 7377fb273fd79e11d57969be80d0682e3469bfbc Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 1 Jul 2013 19:26:54 +0200
Subject: [PATCH] EA-47406 - IOE:
 PsiElementFactoryImpl.createVariableDeclarationStatement

---
 .../daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java
index 4457e5d47c40..0057749d056b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java
@@ -102,8 +102,8 @@ public class AddTypeArgumentsConditionalFix implements IntentionAction {
     return true;
   }
 
-  public static void register(HighlightInfo highlightInfo, PsiExpression expression, PsiType lType) {
-    if (expression instanceof PsiConditionalExpression) {
+  public static void register(HighlightInfo highlightInfo, PsiExpression expression, @NotNull PsiType lType) {
+    if (lType != PsiType.NULL && expression instanceof PsiConditionalExpression) {
       final PsiExpression thenExpression = ((PsiConditionalExpression)expression).getThenExpression();
       final PsiExpression elseExpression = ((PsiConditionalExpression)expression).getElseExpression();
       if (thenExpression != null && elseExpression != null) {