diff --git a/application/src/main/java/com/indiscale/fdo/manager/service/fdo/LoggingApiImpl.java b/application/src/main/java/com/indiscale/fdo/manager/service/fdo/LoggingApiImpl.java
index 3654ad89b9a94aa34f2db01c56417fffccaf25a0..2ca0f6d84c1ff42be2fe9f4daef0a71948e8a05d 100644
--- a/application/src/main/java/com/indiscale/fdo/manager/service/fdo/LoggingApiImpl.java
+++ b/application/src/main/java/com/indiscale/fdo/manager/service/fdo/LoggingApiImpl.java
@@ -33,11 +33,15 @@ public class LoggingApiImpl extends BaseController implements LoggingApi {
       attr.timestamp(
           OffsetDateTime.ofInstant(Instant.ofEpochMilli(r.getTimestamp()), ZoneId.of("UTC")));
       attr.operation(OperationEnum.OP_CREATE);
-      attr.setRepositories(new TargetRepositories().fdo(r.getRepository().getId()));
-      attr.fdo(new DigitalObject().pid(r.getFdo().getPID()));
-      attr.getFdo().setIsFdo(r.getFdo().isFDO());
-      attr.getFdo().setDataPid(r.getFdo().getData().getPID());
-      attr.getFdo().setMetadataPid(r.getFdo().getMetadata().getPID());
+      if (r.getRepository() != null) {
+        attr.setRepositories(new TargetRepositories().fdo(r.getRepository().getId()));
+      }
+      if (r.getFdo() != null) {
+        attr.fdo(new DigitalObject().pid(r.getFdo().getPID()));
+        attr.getFdo().setIsFdo(r.getFdo().isFDO());
+        attr.getFdo().setDataPid(r.getFdo().getData().getPID());
+        attr.getFdo().setMetadataPid(r.getFdo().getMetadata().getPID());
+      }
       data.add(
           new OperationsLogRecord()
               .id(r.getId())