diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm
index 95d4cd92448..f98ee3630c1 100644
--- a/code/game/objects/items/weapons/stock_parts.dm
+++ b/code/game/objects/items/weapons/stock_parts.dm
@@ -24,12 +24,14 @@
 /obj/item/storage/part_replacer/afterattack(obj/machinery/M, mob/user, flag, params)
 	if(!flag && works_from_distance && istype(M))
 		// Make sure its in range
-		if(M in view(user))
+		if(get_dist(src, M) <= (user.client.view + 2))
 			if(M.component_parts)
 				M.exchange_parts(user, src)
 				user.Beam(M,icon_state="rped_upgrade", icon='icons/effects/effects.dmi', time=5)
 		else
 			message_admins("\[EXPLOIT] [key_name_admin(user)] attempted to upgrade machinery with a BRPED via a camera console. (Attempted range exploit)")
+			playsound(src, 'sound/machines/synth_no.ogg', 15, TRUE)
+			to_chat(user, "<span class='notice'>ERROR: [M] is out of [src]'s range!</span>")
 
 /obj/item/storage/part_replacer/bluespace
 	name = "bluespace rapid part exchange device"