diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js
index 45c00b65c..2552e24ec 100644
--- a/lib/metadataTypes/Event.js
+++ b/lib/metadataTypes/Event.js
@@ -689,7 +689,7 @@ class Event extends MetadataType {
                     if (!ca.eventDataSummary.includes(object.dePrefix + fieldName)) {
                         // TODO instead, remove in postRetrieve and re-add in preDeploy
                         errors.push(
-                            `Field ${object.dePrefix + fieldName} is listed under eventDataConfig for referenceObject ${object.referenceObject} but not in eventDataSummary`
+                            `Field ${object.dePrefix + fieldName} is listed under eventDataConfig${object.referenceObject ? ` for referenceObject ` + object.referenceObject : ''} but not in eventDataSummary`
                         );
                     }
                 }
@@ -704,7 +704,11 @@ class Event extends MetadataType {
             const fieldPath = fieldName.split(':');
             fieldName = fieldPath.pop();
             const dePrefix = fieldPath.join(':') + ':';
-            if (!dePrefixFields[dePrefix].includes(fieldName)) {
+            if (!dePrefixFields[dePrefix]) {
+                errors.push(
+                    `Field ${dePrefix + fieldName} is listed under eventDataSummary but object ${dePrefix} was not found in eventDataConfig`
+                );
+            } else if (!dePrefixFields[dePrefix]?.includes(fieldName)) {
                 errors.push(
                     `Field ${dePrefix + fieldName} is listed under eventDataSummary but not in eventDataConfig`
                 );
@@ -956,10 +960,9 @@ class Event extends MetadataType {
             'object' === typeof ca.eventDataConfig
                 ? JSON.stringify(ca.eventDataConfig)
                 : ca.eventDataConfig;
-        ca.eventDataSummary =
-            'object' === typeof ca.eventDataSummary
-                ? ca.eventDataSummary.join('; ') + '; '
-                : ca.eventDataSummary;
+        ca.eventDataSummary = Array.isArray(ca.eventDataSummary)
+            ? ca.eventDataSummary.join('; ') + '; '
+            : ca.eventDataSummary;
         ca.passThroughArgument =
             'object' === typeof ca.passThroughArgument
                 ? JSON.stringify(ca.passThroughArgument)