Improve robustness of participant manager