From ee510e7b123a38f56f32e780f64524925593ec0b Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Wed, 4 Mar 2015 11:29:25 -0500
Subject: [PATCH] Emergency player panel fix

---
 code/__HELPERS/lists.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm
index 3949ba8eced..6f5a9d4e5c1 100644
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -200,6 +200,7 @@ proc/listclearnulls(list/list)
 
 //Mergesort: divides up the list into halves to begin the sort
 /proc/sortAtom(var/list/atom/L, var/order = 1)
+	listclearnulls(L)
 	if(isnull(L) || L.len < 2)
 		return L
 	var/middle = L.len / 2 + 1
@@ -214,8 +215,6 @@ proc/listclearnulls(list/list)
 	while(Li <= L.len && Ri <= R.len)
 		var/atom/rL = L[Li]
 		var/atom/rR = R[Ri]
-		if(!rL.name || !rR.name)
-			continue
 		if(sorttext(rL.name, rR.name) == order)
 			result += L[Li++]
 		else