diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 9ee3d10b6b..5742b74aa4 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -64,6 +64,8 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check
 		C = M.client
 	if(!C)
 		return FALSE
+	if(!(istype(C, /client))) // If we still didn't find a client, something is wrong.
+		return FALSE
 	if(!C.holder)
 		if(show_msg)
 			C << "<span class='warning'>Error: You are not an admin.</span>"