remove specific error, wrap more stuff in retry