diff --git a/code/modules/admin/adminmenu.dm b/code/modules/admin/adminmenu.dm
index fc7a57e212..8954244da4 100644
--- a/code/modules/admin/adminmenu.dm
+++ b/code/modules/admin/adminmenu.dm
@@ -6,6 +6,6 @@
 	set name = "Player Panel"
 	set desc = "Player Panel"
 	set category = "Admin"
-	usr.client.holder.player_panel_new()
-	SSblackbox.add_details("admin_verb","Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	return
\ No newline at end of file
+	if(usr.client.holder)
+		usr.client.holder.player_panel_new()
+		SSblackbox.add_details("admin_verb","Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!