diff --git a/repertory/librepertory/src/providers/base_provider.cpp b/repertory/librepertory/src/providers/base_provider.cpp
index ec8751e3..bc3d3365 100644
--- a/repertory/librepertory/src/providers/base_provider.cpp
+++ b/repertory/librepertory/src/providers/base_provider.cpp
@@ -172,14 +172,15 @@ auto base_provider::create_directory(const std::string &api_path,
                                          "failed to create directory");
       return res;
     }
+
+    meta[META_DIRECTORY] = utils::string::from_bool(true);
+    return set_item_meta(api_path, meta);
   } catch (const std::exception &e) {
     utils::error::raise_api_path_error(function_name, api_path, e,
                                        "failed to create directory");
-    return api_error::error;
   }
 
-  meta[META_DIRECTORY] = utils::string::from_bool(true);
-  return set_item_meta(api_path, meta);
+  return api_error::error;
 }
 
 auto base_provider::create_file(const std::string &api_path, api_meta_map &meta)
@@ -783,17 +784,17 @@ auto base_provider::upload_file(const std::string &api_path,
                                 stop_type &stop_requested) -> api_error {
   REPERTORY_USES_FUNCTION_NAME();
 
+  const auto notify_end = [&api_path,
+                           &source_path](api_error error) -> api_error {
+    event_system::instance().raise<provider_upload_end>(api_path, source_path,
+                                                        error);
+    return error;
+  };
+
   try {
     event_system::instance().raise<provider_upload_begin>(api_path,
                                                           source_path);
 
-    const auto notify_end = [&api_path,
-                             &source_path](api_error error) -> api_error {
-      event_system::instance().raise<provider_upload_end>(api_path, source_path,
-                                                          error);
-      return error;
-    };
-
     return notify_end(upload_file_impl(api_path, source_path, stop_requested));
   } catch (const std::exception &e) {
     utils::error::raise_error(function_name, e, "exception occurred");