diff --git a/repertory/librepertory/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp
index 65a4bab1..29fc8e7a 100644
--- a/repertory/librepertory/src/providers/s3/s3_provider.cpp
+++ b/repertory/librepertory/src/providers/s3/s3_provider.cpp
@@ -190,10 +190,9 @@ auto s3_provider::decrypt_object_name(std::string &object_name) const
     -> api_error {
   auto parts = utils::string::split(object_name, '/', false);
   for (auto &part : parts) {
-    auto err = utils::encryption::decrypt_file_name(
-        get_config().get_s3_config().encryption_token, part);
-    if (err != api_error::success) {
-      return err;
+    if (not utils::encryption::decrypt_file_name(
+            get_config().get_s3_config().encryption_token, part)) {
+      return api_error::decryption_error;
     }
   }
 
@@ -313,10 +312,9 @@ auto s3_provider::get_directory_items_impl(
     std::string child_object_name;
     if (is_encrypted) {
       child_object_name = child_api_path;
-      ret = utils::encryption::decrypt_file_path(cfg.encryption_token,
-                                                 child_api_path);
-      if (ret != api_error::success) {
-        return ret;
+      if (not utils::encryption::decrypt_file_path(cfg.encryption_token,
+                                                   child_api_path)) {
+        return api_error::decryption_error;
       }
     }
 
diff --git a/repertory/repertory_test/src/providers_test.cpp b/repertory/repertory_test/src/providers_test.cpp
index b69a8916..900b862a 100644
--- a/repertory/repertory_test/src/providers_test.cpp
+++ b/repertory/repertory_test/src/providers_test.cpp
@@ -166,9 +166,8 @@ const auto decrypt_parts = [](const repertory::app_config &cfg,
         continue;
       }
 
-      EXPECT_EQ(repertory::api_error::success,
-                repertory::utils::encryption::decrypt_file_name(
-                    cfg.get_encrypt_config().encryption_token, part));
+      EXPECT_EQ(true, repertory::utils::encryption::decrypt_file_name(
+                          cfg.get_encrypt_config().encryption_token, part));
     }
     path = repertory::utils::string::join(parts, '/');
   }
diff --git a/support/src/utils/encryption.cpp b/support/src/utils/encryption.cpp
index eec96407..22d77ced 100644
--- a/support/src/utils/encryption.cpp
+++ b/support/src/utils/encryption.cpp
@@ -22,6 +22,7 @@
 #include "utils/encryption.hpp"
 
 #include "utils/collection.hpp"
+#include "utils/encrypting_reader.hpp"
 
 #if defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST)