Added message command retry logic.