Cosmetic surgery on fault messages