Revert "Added some failsafes"

This reverts commit 04bcd4aa93878bf08bc0c42a7521da1990e51b95.