Adding failsafe