remove more repetition of error path