Tidy up errors for unexpected results