Fail protection (21/23)

Fail protection