cleanup
Fix NRE in boostrapper