diff --git a/repertory/librepertory/include/comm/curl/curl_comm.hpp b/repertory/librepertory/include/comm/curl/curl_comm.hpp
index 707c5c38..a5100ac7 100644
--- a/repertory/librepertory/include/comm/curl/curl_comm.hpp
+++ b/repertory/librepertory/include/comm/curl/curl_comm.hpp
@@ -239,7 +239,7 @@ public:
     for (std::uint8_t retry = 0U; !ret && retry < 5U; ++retry) {
       ret = do_request();
       if (ret) {
-        continue;
+        break;
       }
 
       if (curl_code == CURLE_COULDNT_RESOLVE_HOST) {
@@ -247,7 +247,7 @@ public:
         continue;
       }
 
-      return ret;
+      break;
     }
 
     return ret;
diff --git a/repertory/librepertory/include/providers/s3/s3_provider.hpp b/repertory/librepertory/include/providers/s3/s3_provider.hpp
index 4d9f1f04..22c5b518 100644
--- a/repertory/librepertory/include/providers/s3/s3_provider.hpp
+++ b/repertory/librepertory/include/providers/s3/s3_provider.hpp
@@ -70,8 +70,9 @@ private:
       -> api_error;
 
   [[nodiscard]] auto get_last_modified(bool directory,
-                                       const std::string &api_path) const
-      -> std::uint64_t;
+                                       const std::string &api_path,
+                                       std::uint64_t &last_modified) const
+      -> api_error;
 
   [[nodiscard]] auto
   get_object_info(bool directory, const std::string &api_path,
diff --git a/repertory/librepertory/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp
index 03aec72a..0e4ae77a 100644
--- a/repertory/librepertory/src/providers/s3/s3_provider.cpp
+++ b/repertory/librepertory/src/providers/s3/s3_provider.cpp
@@ -209,10 +209,18 @@ auto s3_provider::create_directory_paths(const std::string &api_path,
         }
       }
 
+      std::uint64_t last_modified{};
+      if (exists) {
+        res = get_last_modified(true, cur_path, last_modified);
+        if (res != api_error::success) {
+          return res;
+        }
+      } else {
+        last_modified = utils::time::get_time_now();
+      }
+
       auto dir{
-          create_api_file(cur_path, cur_key, 0U,
-                          exists ? get_last_modified(true, cur_path)
-                                 : utils::time::get_time_now()),
+          create_api_file(cur_path, cur_key, 0U, last_modified),
       };
       get_api_item_added()(true, dir);
     }
@@ -624,16 +632,19 @@ auto s3_provider::get_file_list(api_file_list &list, std::string &marker) const
   return api_error::error;
 }
 
-auto s3_provider::get_last_modified(bool directory,
-                                    const std::string &api_path) const
-    -> std::uint64_t {
+auto s3_provider::get_last_modified(bool directory, const std::string &api_path,
+                                    std::uint64_t &last_modified) const
+    -> api_error {
   bool is_encrypted{};
   std::string object_name;
   head_object_result result{};
-  return (get_object_info(directory, api_path, is_encrypted, object_name,
-                          result) == api_error::success)
-             ? result.last_modified
-             : utils::time::get_time_now();
+  auto res =
+      get_object_info(directory, api_path, is_encrypted, object_name, result);
+  if (res == api_error::success) {
+    last_modified = result.last_modified;
+  }
+
+  return res;
 }
 
 auto s3_provider::get_object_info(bool directory, const std::string &api_path,