diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
index 3f18b1498f8..9ef8379c799 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
@@ -905,8 +905,10 @@ public class JetControlFlowProcessor {
             PseudoValue value = builder.magic(
                     loopRange != null ? loopRange : expression,
                     null,
-                    Collections.singletonList(loopRangeValue),
-                    Collections.singletonMap(loopRangeValue, loopRangeTypePredicate),
+                    ContainerUtil.createMaybeSingletonList(loopRangeValue),
+                    loopRangeValue != null
+                        ? Collections.singletonMap(loopRangeValue, loopRangeTypePredicate)
+                        : Collections.<PseudoValue, TypePredicate>emptyMap(),
                     MagicKind.LOOP_RANGE_ITERATION
             ).getOutputValue();