[v6r10] BundleDelivery - protect against empty bundle case