diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 73b28283d63..3bae29dc007 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -45,7 +45,7 @@ proc/get_all_admin_clients()
 	usr << "<b>Current Admins:</b>"
 
 	for (var/mob/M in admin_list)
-		if(M && M.client)
+		if(M && M.client && M.client.holder)
 			if(usr.client)
 				var/afk = 0
 				if( M.client.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.