Better error handling in bootstrapper