Index: ForEach.java
===================================================================
--- ForEach.java	(revision 1416791)
+++ ForEach.java	(working copy)
@@ -155,6 +155,9 @@
         ctxt.generateJavaSource("else if (" + itemsV + " instanceof Map)");
         ctxt.generateJavaSource(iterV + "=((Map)" + itemsV + ").entrySet().iterator();");
         
+        // Not null
+        ctxt.generateJavaSource("if (" + iterV + " != null) {");
+
         if (hasBegin) {
             String tV = ctxt.getTemporaryVariableName();
             ctxt.generateJavaSource("for (int " + tV + "=" + beginV + ";" +
@@ -196,6 +199,7 @@
             ctxt.generateJavaSource("break;");
         }
         ctxt.generateJavaSource("}"); // while
+        ctxt.generateJavaSource("}"); // Not Null
     }
     
     /**