Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
===================================================================
--- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java	(revision 1524952)
+++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java	(working copy)
@@ -253,18 +253,13 @@
         String name = PathUtils.getName(path);
         if (name.isEmpty()) {
             return getRootNode();
-        } else {
-            Tree parent = root.getTree(PathUtils.getParentPath(path));
-            if (parent.hasProperty(name)) {
-                return PropertyDelegate.create(this, parent, name);
-            }
-            Tree child = parent.getChild(name);
-            if (child.exists()) {
-                return NodeDelegate.create(this, child);
-            } else {
-                return null;
-            }
         }
+        Tree parent = root.getTree(PathUtils.getParentPath(path));
+        PropertyDelegate p = PropertyDelegate.create(this, parent, name);
+        if (p != null) {
+            return p;
+        }
+        return NodeDelegate.create(this, parent.getChild(name));
     }
 
     @CheckForNull