Index: src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java
===================================================================
--- src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java	(revision 1130154)
+++ src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java	(working copy)
@@ -89,7 +89,7 @@
             if (path == null) {
                 return nEntry;
             } else {
-                return nEntry.lookupDeepEntry(path);
+                return nEntry != null ? nEntry.lookupDeepEntry(path) : null;
             }
         }
     }