diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 46544a0809..1fd2464715 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -144,7 +144,9 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check
 	if(!forceGlobal && usr)
 		var/client/C = usr.client
 		if(!C)
-			CRASH("No client for HrefToken()!")
+			// CRASH("No client for HrefToken()!") //Chomp EDIT - this seems be to encountered and we don't want this to crash
+			log_debug("Attempted to retrieve a HrefToken of an entity with no client.") //Chomp EDIT
+			return 0 //Chomp EDIT
 		var/datum/admins/holder = C.holder
 		if(holder)
 			tok = holder.href_token