Raised debug fidelity, and fixed NPE when bundle contents were incorrect