Added retry logic for clients (to avoid floods)