Fail safety

Fail safety