diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 73b95c0d3f7..bd35abb19a6 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -62,14 +62,21 @@
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
 
 /obj/item/clothing/head/helmet/space/plasmaman/attack_self(mob/user)
+	toggle_light(user)
+
+/obj/item/clothing/head/helmet/space/plasmaman/proc/toggle_light(mob/user)
 	on = !on
 	icon_state = "[initial(icon_state)][on ? "-light":""]"
 	item_state = icon_state
-	user.update_inv_head() //So the mob overlay updates
+	
+	var/mob/living/carbon/human/H = user
+	if(istype(H))
+		H.update_inv_head()
 
 	if(on)
 		if(!up)
-			to_chat(user, "<span class='notice'>Your helmet's torch can't pass through your welding visor!</span>")
+			if(istype(H))
+				to_chat(user, "<span class='notice'>Your helmet's torch can't pass through your welding visor!</span>")
 			set_light(0)
 		else
 			set_light(brightness_on)
@@ -80,6 +87,10 @@
 		var/datum/action/A=X
 		A.UpdateButtonIcon()
 
+/obj/item/clothing/head/helmet/space/plasmaman/extinguish_light()
+	if(on)
+		toggle_light()
+
 /obj/item/clothing/head/helmet/space/plasmaman/security
 	name = "security plasma envirosuit helmet"
 	desc = "A plasmaman containment helmet designed for security officers, protecting them from being flashed and burning alive, along-side other undesirables."