diff --git a/code/datums/ai/generic/generic_behaviors.dm b/code/datums/ai/generic/generic_behaviors.dm index 89f6d933c64..d482041e7ed 100644 --- a/code/datums/ai/generic/generic_behaviors.dm +++ b/code/datums/ai/generic/generic_behaviors.dm @@ -87,7 +87,10 @@ /datum/ai_behavior/use_on_object/setup(datum/ai_controller/controller, target_key) . = ..() var/datum/weakref/target_ref = controller.blackboard[target_key] - controller.current_movement_target = target_ref?.resolve() + var/target = target_ref?.resolve() + if(!target) + return FALSE + controller.current_movement_target = target /datum/ai_behavior/use_on_object/perform(delta_time, datum/ai_controller/controller, target_key) . = ..()