diff --git oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
index 6b274e0..973ed7e 100644
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
@@ -434,13 +434,27 @@ public class SegmentNodeStoreService extends ProxyNodeStore
         return true;
     }
 
-    private static String lookup(ComponentContext context, String property) {
-        if (context.getProperties().get(property) != null) {
-            return context.getProperties().get(property).toString();
+    private String lookup(ComponentContext context, String name) {
+        Object componentObject = context.getProperties().get(name);
+
+        if (componentObject != null) {
+            String componentString = componentObject.toString().trim();
+
+            if (!componentString.isEmpty()) {
+                return componentString;
+            }
         }
-        if (context.getBundleContext().getProperty(property) != null) {
-            return context.getBundleContext().getProperty(property);
+
+        Object bundleObject = context.getBundleContext().getProperty(name);
+
+        if (bundleObject != null) {
+            String bundleString = bundleObject.toString().trim();
+
+            if (!bundleString.isEmpty()) {
+                return bundleString;
+            }
         }
+
         return null;
     }