Retry refact
Server error retry