Protect against empty bundle case
Merge pull request #1806 from atsareg/fix-v6r10

[v6r10] BundleDelivery - protect against empty bundle case