handle errors returned by boot steps
Merge bug25693
stable to default