From c228418bd7e1078c8e32eaa86308a97ef2ef49cb Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Wed, 18 Dec 2024 19:27:40 +0200
Subject: [PATCH] Update SummaryManagerImpl.java

---
 .../orcid/core/common/manager/impl/SummaryManagerImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java b/orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java
index 9594550614..7e2bad4366 100644
--- a/orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java
+++ b/orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java
@@ -283,7 +283,7 @@ public RecordSummaryPojo getRecordSummaryPojo(String orcid) {
                 for (EmailDomain ed : recordSummary.getEmailDomains().getEmailDomains()) {
                     EmailDomainSummary eds = new EmailDomainSummary();
                     eds.setValue(ed.getValue());
-                    if (ed.getVerificationDate() != null) {
+                    if (ed.getVerificationDate() != null && ed.getVerificationDate().getValue() != null) {
                         eds.setVerificationDate(ed.getVerificationDate().toString());
                     }
                     emailDomains.add(eds);
@@ -524,7 +524,7 @@ public void generateEmailDomainsSummary(RecordSummary recordSummary, String orci
                 for (ProfileEmailDomainEntity ped : emailDomains) {
                     ed = new EmailDomain();
                     ed.setValue(ped.getEmailDomain());
-                    if (!ped.getGeneratedByScript()) {
+                    if (!ped.getGeneratedByScript() && ped.getDateCreated() != null) {
                         VerificationDate verificationDate = new VerificationDate(DateUtils.convertToXMLGregorianCalendar(ped.getDateCreated()));
                         ed.setVerificationDate(verificationDate);
                     }