diff --git a/repertory/librepertory/src/file_manager/cache_size_mgr.cpp b/repertory/librepertory/src/file_manager/cache_size_mgr.cpp
index f1fe7bf3..5dde8fa1 100644
--- a/repertory/librepertory/src/file_manager/cache_size_mgr.cpp
+++ b/repertory/librepertory/src/file_manager/cache_size_mgr.cpp
@@ -42,6 +42,7 @@ E_SIMPLE2(max_cache_size_reached, warn, true,
 
 cache_size_mgr cache_size_mgr::instance_{};
 
+// TODO add timeout
 auto cache_size_mgr::expand(std::uint64_t size) -> api_error {
   if (size == 0U) {
     return api_error::success;
diff --git a/repertory/librepertory/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp
index 1f95b5bf..65234cd8 100644
--- a/repertory/librepertory/src/file_manager/file_manager.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager.cpp
@@ -604,7 +604,7 @@ auto file_manager::remove_source_and_shrink_cache(
   REPERTORY_USES_FUNCTION_NAME();
 
   auto file = utils::file::file{source_path};
-  auto source_size = file.size().value_or(0U);
+  auto source_size = file.exists() ? file.size().value_or(0U) : 0U;
 
   if (not file.remove()) {
     utils::error::raise_api_path_error(function_name, api_path, source_path,