diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
index 547c23e25..a7ca04c6a 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
@@ -317,8 +317,12 @@ public class Dmp implements ElasticEntity<Dmp> {
 			if (fields.get(MapKey.GRANTSTATUS.getName()) != null) {
 				this.grantStatus = Short.valueOf(fields.get(MapKey.GRANTSTATUS.getName()).toString());
 			}
-			this.created = Date.from(Instant.parse(fields.get(MapKey.CREATED.getName()).toString()));
-			this.modified = Date.from(Instant.parse(fields.get(MapKey.MODIFIED.getName()).toString()));
+			if (fields.containsKey(MapKey.CREATED.getName())) {
+				this.created = Date.from(Instant.parse(fields.get(MapKey.CREATED.getName()).toString()));
+			}
+			if (fields.containsKey(MapKey.MODIFIED.getName())) {
+				this.modified = Date.from(Instant.parse(fields.get(MapKey.MODIFIED.getName()).toString()));
+			}
 			if (fields.get(MapKey.FINALIZEDAT.getName()) != null) {
 				this.finalizedAt = Date.from(Instant.parse(fields.get(MapKey.FINALIZEDAT.getName()).toString()));
 			}