Ensure ship address before transition from address