Index: ContentNodeIterator.java
===================================================================
--- ContentNodeIterator.java	(revision 13169)
+++ ContentNodeIterator.java	(working copy)
@@ -58,7 +58,7 @@
  * @author Sameer Charles
  * @author Fabrizio Giustina
  * @author David Smith
- * @version $Revision: $ ($Author: $)
+ * @version $Revision$ ($Author$)
  */
 public class ContentNodeIterator extends BaseContentTag {
 
@@ -195,7 +195,11 @@
         }
         else if (StringUtils.isNotEmpty(this.contentNodeCollectionName)) {
             // If this is a nested iterator, the collection should be from the local content node.
-            return super.resolveNode(Resource.getCurrentActivePage()).getChildren(ItemType.CONTENTNODE);
+            Content node = super.resolveNode(Resource.getCurrentActivePage());
+            if (node == null) {
+                throw new PathNotFoundException();
+            }
+            return node.getChildren(ItemType.CONTENTNODE);
         }
 
         return Collections.EMPTY_LIST;