From 4e2a68bdefc2a744e3f63e178d5a2a5f5d7357df Mon Sep 17 00:00:00 2001
From: lew <82828093+Llywelwyn@users.noreply.github.com>
Date: Mon, 1 Jun 2026 11:32:10 +0100
Subject: [PATCH] Fixes an unguarded nullref in Fake Crew Arrival Announcement
 service (#22565)

fixes #22334

- bugfix: "Fake Crew Arrival Announcement uplink service now works even
with an invalid employer faction."
---
 code/datums/uplink/announcements.dm       | 2 +-
 html/changelogs/llywelwyn-crewarrival.yml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/llywelwyn-crewarrival.yml

diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm
index 70a5a081736..9b39dacc46c 100644
--- a/code/datums/uplink/announcements.dm
+++ b/code/datums/uplink/announcements.dm
@@ -54,7 +54,7 @@
 		record.sex = I.sex
 		record.employer = I.employer_faction
 		var/datum/faction/id_faction = SSjobs.name_factions[I.employer_faction]
-		var/faction_abbreviation = id_faction.title_suffix
+		var/faction_abbreviation = id_faction?.title_suffix
 		var/assignment = "[I.assignment][ faction_abbreviation ? " ([faction_abbreviation])" : ""]"
 		record.rank = assignment
 		record.real_rank = assignment
diff --git a/html/changelogs/llywelwyn-crewarrival.yml b/html/changelogs/llywelwyn-crewarrival.yml
new file mode 100644
index 00000000000..348d8a48c3a
--- /dev/null
+++ b/html/changelogs/llywelwyn-crewarrival.yml
@@ -0,0 +1,4 @@
+author: Llywelwyn
+delete-after: True
+changes:
+  - bugfix: "Fake Crew Arrival Announcement uplink service now works even with an invalid employer faction."