move back to error catching and checking