Added more fail safes