sb: Clean up the bootstrap error handling.