diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
index 8fddf2096830..d915d14f4bc3 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
@@ -37,6 +37,7 @@ import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -703,7 +704,7 @@ public class GenericsHighlightUtil {
   }
 
   @Nullable
-  public static PsiType getCollectionItemType(PsiExpression expression) {
+  public static PsiType getCollectionItemType(@NotNull PsiExpression expression) {
     final PsiType type = expression.getType();
     if (type == null) return null;
     if (type instanceof PsiArrayType) {
diff --git a/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
index 7cb7f5eed2ea..7afcb0f37bd7 100644
--- a/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
@@ -184,7 +184,9 @@ public class UncheckedWarningLocalInspection extends BaseJavaLocalInspectionTool
       if (!PsiUtil.isLanguageLevel5OrHigher(statement)) return;
       final PsiParameter parameter = statement.getIterationParameter();
       final PsiType parameterType = parameter.getType();
-      final PsiType itemType = GenericsHighlightUtil.getCollectionItemType(statement.getIteratedValue());
+      final PsiExpression iteratedValue = statement.getIteratedValue();
+      if (iteratedValue == null) return;
+      final PsiType itemType = GenericsHighlightUtil.getCollectionItemType(iteratedValue);
       if (!PsiUtil.isLanguageLevel5OrHigher(statement)) return;
       checkRawToGenericsAssignment(parameter, parameterType, itemType, true, myOnTheFly ? getChangeVariableTypeFixes(parameter, itemType) : null);
     }