Added retries when getting errors while fetching folders (issue #2552)