small changes to hunt down a crash while removing a bundle from queue