diff --git a/app/models/scoring-event.ts b/app/models/scoring-event.ts
index dba9a74..28478ee 100644
--- a/app/models/scoring-event.ts
+++ b/app/models/scoring-event.ts
@@ -498,11 +498,13 @@ export async function getUpcomingEventsForDraftedParticipants(
 
     const pMap = participantsByEvent.get(row.id);
     if (pMap) {
-      if (row.participant1Id && draftedMap.has(row.participant1Id)) {
-        pMap.set(row.participant1Id, draftedMap.get(row.participant1Id) ?? "");
+      if (row.participant1Id) {
+        const p1 = draftedMap.get(row.participant1Id);
+        if (p1) pMap.set(row.participant1Id, p1);
       }
-      if (row.participant2Id && draftedMap.has(row.participant2Id)) {
-        pMap.set(row.participant2Id, draftedMap.get(row.participant2Id) ?? "");
+      if (row.participant2Id) {
+        const p2 = draftedMap.get(row.participant2Id);
+        if (p2) pMap.set(row.participant2Id, p2);
       }
     }
 
diff --git a/app/services/standings-sync/index.ts b/app/services/standings-sync/index.ts
index 76b3044..5720e3d 100644
--- a/app/services/standings-sync/index.ts
+++ b/app/services/standings-sync/index.ts
@@ -86,7 +86,7 @@ export async function syncStandings(sportsSeasonId: string): Promise<SyncResult>
       if (matchedName) {
         participant = participantByName.get(matchedName) ?? null;
         // Write-back: persist externalId so future syncs skip name matching for this team
-        if (!participant.externalId) {
+        if (participant && !participant.externalId) {
           await updateParticipant(participant.id, { externalId: record.externalTeamId });
         }
       }