Added extra error handling to bootstrapper