Add failsafe