Change most die to error or abort