diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm
index 3516758366d..732db5c9c66 100644
--- a/code/modules/recycling/conveyor.dm
+++ b/code/modules/recycling/conveyor.dm
@@ -195,6 +195,11 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 	if(!operating)
 		SSmove_manager.stop_looping(convayable, SSconveyors)
 		return
+	//NSV13 - account for potentially changing location between sig send and reaching this.
+	if(convayable.loc != source)
+		SSmove_manager.stop_looping(convayable, SSconveyors)
+		return
+	//NSV13 end.
 	start_conveying(convayable)
 
 /obj/machinery/conveyor/proc/conveyable_exit(datum/source, atom/convayable, direction)
diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/automation.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/automation.dm
index bc73a314cc3..8645d633227 100644
--- a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/automation.dm
+++ b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/automation.dm
@@ -147,6 +147,8 @@
 		return
 	if(!isobj(entering) || iseffect(entering))
 		return
+	if(entering.loc != source)
+		return
 	if(length(held_components) > 0)
 		var/obj/held_component = held_components[1]
 		if(held_component.type == entering.type) //Please do throw these hungry machines some components.