cleaning up a few error states to actually return something