From 564860285dd3f3ec8239c13e55e7aa92b05392f8 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 10 Feb 2018 11:28:06 -0500
Subject: [PATCH 1/2] Fix a runtime if someone is deleted on the arrivals
 shuttle (#35459)

* Fix a runtime if someone is deleted on the arrivals shuttle

* Duh
---
 code/__HELPERS/game.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index b120dfd52c..db51e76232 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -539,7 +539,7 @@
 	winset(C, "mainwindow", "flash=5")
 
 /proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
-	if(!SSticker.IsRoundInProgress() || !character)
+	if(!SSticker.IsRoundInProgress() || QDELETED(character))
 		return
 	var/area/A = get_area(character)
 	var/message = "<span class='game deadsay'><span class='name'>\