Revert "More error checks"

This reverts commit 46735bfe46632ba5b87136d7ae398d93045924f1.