Fail protection (9/23)

Fail protection