WIP: Running with null DeliverySettings