Small code improvements

A little more defensive in the case of a missing bundle.
And in the case of keyboard files when installing.