Add exceptions catching and retrying