diff --git a/repertory/repertory/main.cpp b/repertory/repertory/main.cpp
index a93ac2cf..3cfacfd4 100644
--- a/repertory/repertory/main.cpp
+++ b/repertory/repertory/main.cpp
@@ -106,16 +106,17 @@ auto main(int argc, char **argv) -> int {
     std::string data;
     res = utils::cli::parse_string_option(
         args, utils::cli::options::name_option, data);
-    if (res == exit_code::option_not_found && prov == provider_type::sia) {
-      unique_id = "default";
-      res = exit_code::success;
-    } else if (res == exit_code::success) {
+    if (res == exit_code::success) {
       unique_id = utils::string::trim(data);
       if (unique_id.empty()) {
         std::cerr << "Name of " << app_config::get_provider_name(prov)
                   << " instance not provided" << std::endl;
         res = exit_code::invalid_syntax;
       }
+    } else if (res == exit_code::option_not_found &&
+               prov == provider_type::sia) {
+      unique_id = "default";
+      res = exit_code::success;
     }
 
     if (res == exit_code::success) {