fix for when delivery_tag_pool is None (thanks @hodgestar)