Bug 8261: prevent TestBundleDiag from throwing NPE