Added failsafes