diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b195704ce15..7baf9bb6cc7 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -449,16 +449,18 @@
 		return FALSE
 	return TRUE
 
-/obj/item/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params)
-	if(!ishuman(user) || !ishuman(target))
+/obj/item/gun/proc/handle_suicide(mob/user, mob/living/carbon/human/target, params)
+	if(!ishuman(target)) // So only human-type mobs can be executed.
 		return
 
 	if(semicd)
 		return
 
 	if(user == target)
+		if(!ishuman(user))	// Borg suicide needs a refactor for this to work.
+			return
 		target.visible_message("<span class='warning'>[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...</span>", \
-			"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>")
+		"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>")
 	else
 		target.visible_message("<span class='warning'>[user] points [src] at [target]'s head, ready to pull the trigger...</span>", \
 			"<span class='userdanger'>[user] points [src] at your head, ready to pull the trigger...</span>")