diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/PropertyConfigurationsServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/PropertyConfigurationsServiceImpl.java
index 0fad858551a6aaaf34e2c9ddd7ef808056a011b9..91b58d88e6482ccd0273c49c47c15d3b75ce9141 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/PropertyConfigurationsServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/PropertyConfigurationsServiceImpl.java
@@ -195,7 +195,7 @@ public class PropertyConfigurationsServiceImpl implements PropertyConfigurations
 
                         for (String relatedObjectId : relatedObjectIds) {
                             String id = PropertyUtil.removeIdPostfix(relatedObjectId);
-                            Map<String, Object> relatedObject = idObjectDataMap.containsKey(id)? idObjectDataMap.get(id) : null;
+                            Map<String, Object> relatedObject = idObjectDataMap.getOrDefault(id, new HashMap<>());
                             Map<String, Object> propertyValues = getExtendedPropertyValues(extendedPropertyName, relatedObject, path.getValueExtraction(), configuration.isExtractFirstMatch());
                             if (allPropertyValues.isEmpty() && configuration.isExtractFirstMatch()) {
                                 allPropertyValues = propertyValues;