Fix NPE in Bootstrap