Fixed possible failure point in failsafe