Tentative Fix for NPE with "toolbar" bundles.

[1718]