Fix NRE in boostrapper