diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index e59f8ef6159..804e14b4795 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -164,6 +164,7 @@
 	var/safety = !emagged
 	if(cooldown > world.time)
 		user << "<font color='red'>The device is still recharging!</font>"
+		return
 
 	if(isrobot(user))
 		var/mob/living/silicon/robot/R = user
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index ec42a271121..1708c1e81e6 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -120,6 +120,8 @@
 	range = 10
 
 /obj/item/projectile/energy/trap/cyborg/on_hit(atom/target, blocked = 0)
+	if(!ismob(target) || blocked >= 100)
+		qdel(src)
 	if(iscarbon(target))
 		var/obj/item/weapon/restraints/legcuffs/beartrap/B = new /obj/item/weapon/restraints/legcuffs/beartrap/energy/cyborg(get_turf(target))
 		B.Crossed(target)