From 8d3d328b84b10d9ff880773e2973e2fdd4c3a6c8 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Wed, 9 Feb 2022 18:19:42 +0000
Subject: [PATCH] Fixes a major runtime I accidently caused (#17394)

---
 code/modules/client/client_procs.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index e2728a270f9..11a3327f819 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -433,6 +433,9 @@
 
 
 /client/proc/announce_join()
+	if(!holder)
+		return
+
 	if(holder.rights & R_MENTOR)
 		if(SSredis.connected)
 			var/list/mentorcounter = staff_countup(R_MENTOR)
@@ -454,6 +457,9 @@
 			SSredis.publish("byond.asay.out", json_encode(data))
 
 /client/proc/announce_leave()
+	if(!holder)
+		return
+
 	if(holder.rights & R_MENTOR)
 		if(SSredis.connected)
 			var/list/mentorcounter = staff_countup(R_MENTOR)