diff --git a/code/datums/client_image_controller.dm b/code/datums/client_image_controller.dm
index 7d4ebc0c92a10..824dfe0770168 100644
--- a/code/datums/client_image_controller.dm
+++ b/code/datums/client_image_controller.dm
@@ -344,7 +344,7 @@ GLOBAL_DATUM_INIT(cimg_controller, /datum/cimg_controller, new)
 
 /// a thing is destroyed or no longer has its own special image
 /// Typically, you don't call this proc directly. Use `GLOB.cimg_controller.cut_client_images()`
-/datum/cimg_holder/proc/_disappear_from_validated(client_images, need_refresh = FALSE)
+/datum/cimg_holder/proc/_disappear_from_validated(client_images)
 	var/list/applied_clients = list()
 	for(var/mob/each_mob as anything in valid_mobs)
 		if(!each_mob.client)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 4a170f5562e1b..bc8b96dd6feec 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -1118,6 +1118,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	set desc = "Give client image visibility validation to your current mob."
 	if(!holder)
 		return
+	if(!length(GLOB.cimg_controller.cimg_holders))
+		client_alert(src, "There's no active client image key in the game", "Client Image Holders")
+		return
 
 	if(!isobserver(src.mob))
 		alert(src, "Note that you are not using this as non-ghost. This may change your game.", "Warning Reminder")
@@ -1134,6 +1137,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	set desc = "Disqualify your client image visibility from your current mob."
 	if(!holder)
 		return
+	if(!length(GLOB.cimg_controller.cimgkey_by_mob[src.mob]))
+		client_alert(src, "There's no client image key to you", "Client Image Holders")
+		return
 
 	if(!isobserver(src.mob))
 		alert(src, "Note that you are not using this as non-ghost. This may change your game.", "Warning Reminder")