More fixes to bootstrap: error handling etc.