Add retry in message server client