Cleaning up some code, since I've got debug output I should get detailed info on errors and not need a bunch of these checks and such