Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java	(revision 1182744)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java	(working copy)
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.core.version;
 
 import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_ACTIVITY;
+import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_ROOTVERSION;
 import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_VERSIONHISTORY;
 import static org.apache.jackrabbit.spi.commons.name.NameConstants.MIX_VERSIONABLE;
 
@@ -147,8 +148,8 @@
             Name name = getName(uuid);
 
             NodeStateEx parent = getParentNode(getHistoryRoot(), uuid, null);
-            if (parent != null && parent.hasNode(name)) {
-                NodeStateEx history = parent.getNode(name, 1);
+            NodeStateEx history = parent != null ? parent.getNode(name, 1) : null;
+            if (history != null) {
                 return getVersionHistory(history.getNodeId());
             } else {
                 throw new ItemNotFoundException("Version history of node " + id + " not found.");
@@ -313,12 +314,11 @@
             Name name = getName(uuid);
 
             NodeStateEx parent = getParentNode(getHistoryRoot(), uuid, null);
-            if (parent != null && parent.hasNode(name)) {
-                NodeStateEx history = parent.getNode(name, 1);
-                Name root = NameConstants.JCR_ROOTVERSION;
+            NodeStateEx history = parent != null ? parent.getNode(name, 1) : null;
+            if (history != null) {
                 info = new VersionHistoryInfo(
                         history.getNodeId(),
-                        history.getState().getChildNodeEntry(root, 1).getId());
+                        history.getState().getChildNodeEntry(JCR_ROOTVERSION, 1).getId());
             }
         } finally {
             lock.release();