Revert more bad changes

Need to readd try catch statements on previous commit.