Adding a failsafe