Better handling of errors in PD leaders