a little more cleanup of error stuff