(For anyone curious - I just added a

find_shipment unless @order

to the

lock_order

call. In case anyone else happens to have a similar use case)