diff --git a/server/fortellis/fortellis.js b/server/fortellis/fortellis.js
index a6776386b..fd61e8e04 100644
--- a/server/fortellis/fortellis.js
+++ b/server/fortellis/fortellis.js
@@ -306,8 +306,7 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
             CreateFortellisLogEvent(socket, "ERROR", `{7.1} Error posting vehicle service history. ${error.message}`);
           }
 
-          //TODO: IF THE VEHICLE SERVICE HISTORY FAILS, WE NEED TO MARK IT AS SUCH AND NOT DELETE THE TRANSACTION.
-          //socket.emit("export-success", JobData.id);
+          socket.emit("export-success", JobData.id);
         } else {
           //There was something wrong. Throw an error to trigger clean up. 
           //throw new Error("Error posting DMS Batch Transaction");
@@ -431,10 +430,10 @@ async function QueryDmsCustomerByName({ socket, redisHelpers, JobData }) {
   const ownerName =
     JobData.ownr_co_nm && JobData.ownr_co_nm.trim() !== ""
       //? [["firstName", JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()]] // Commented out until we receive direction. 
-      ? [["email", JobData.ownr_ea.toUpperCase()]]
+      ? [["email", JobData.ownr_ea?.toUpperCase()]]
       : [
-        ["firstName", JobData.ownr_fn.replace(replaceSpecialRegex, "").toUpperCase()],
-        ["lastName", JobData.ownr_ln.replace(replaceSpecialRegex, "").toUpperCase()]
+        ["firstName", JobData.ownr_fn?.replace(replaceSpecialRegex, "").toUpperCase()],
+        ["lastName", JobData.ownr_ln?.replace(replaceSpecialRegex, "").toUpperCase()]
       ];
   try {
     const result = await MakeFortellisCall({