no more failwith in places it oughtn't