1 files changed, 1 insertions, 1 deletions
diff --git a/adservices/service-core/java/com/android/adservices/data/measurement/DatastoreManager.java b/adservices/service-core/java/com/android/adservices/data/measurement/DatastoreManager.java
index a652f72641..10b09d3c9e 100644
--- a/adservices/service-core/java/com/android/adservices/data/measurement/DatastoreManager.java
+++ b/adservices/service-core/java/com/android/adservices/data/measurement/DatastoreManager.java
@@ -85,7 +85,7 @@ public abstract class DatastoreManager {
 
         Optional<T> result;
         try {
-            result = Optional.of(execute.apply(measurementDao));
+            result = Optional.ofNullable(execute.apply(measurementDao));
         } catch (DatastoreException ex) {
             result = Optional.empty();
             LogUtil.e(ex, "DatastoreException thrown during transaction");