diff --git a/vault/src/main/java/org/opencadc/vault/NodePersistenceImpl.java b/vault/src/main/java/org/opencadc/vault/NodePersistenceImpl.java
index 54dd0348..3b0f4821 100644
--- a/vault/src/main/java/org/opencadc/vault/NodePersistenceImpl.java
+++ b/vault/src/main/java/org/opencadc/vault/NodePersistenceImpl.java
@@ -521,11 +521,7 @@ private class ChildNodeWrapper implements ResourceIterator<Node> {
         
         @Override
         public boolean hasNext() {
-            return !closedForException && childIter.hasNext();
-            //if (childIter != null) {
-            //    return childIter.hasNext();
-            //}
-            //return false;
+            return !closedForException && childIter != null && childIter.hasNext();
         }
 
         @Override