Handle state change failures better