Adding failsafes