Add boot failure handling