diff --git a/repertory/librepertory/src/drives/directory_cache.cpp b/repertory/librepertory/src/drives/directory_cache.cpp
index 4e65b164..f7f4e057 100644
--- a/repertory/librepertory/src/drives/directory_cache.cpp
+++ b/repertory/librepertory/src/drives/directory_cache.cpp
@@ -37,7 +37,7 @@ void directory_cache::execute_action(const std::string &api_path,
 
 auto directory_cache::get_directory(directory_iterator *iterator)
     -> std::shared_ptr<directory_iterator> {
-  if (iterator) {
+  if (iterator != nullptr) {
     recur_mutex_lock directory_lock(directory_mutex_);
     const auto it =
         std::find_if(directory_lookup_.begin(), directory_lookup_.end(),
@@ -66,7 +66,7 @@ auto directory_cache::remove_directory(const std::string &api_path)
 }
 
 void directory_cache::remove_directory(directory_iterator *iterator) {
-  if (iterator) {
+  if (iterator != nullptr) {
     recur_mutex_lock directory_lock(directory_mutex_);
     const auto it =
         std::find_if(directory_lookup_.begin(), directory_lookup_.end(),
diff --git a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
index bbd20aaf..d34f1017 100644
--- a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
+++ b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
@@ -682,7 +682,8 @@ auto remote_server::fuse_readdir(const char *path,
     errno = ERANGE;
     res = -1;
   } else {
-    auto *iterator = reinterpret_cast<directory_iterator *>(handle);
+    auto iterator = directory_cache_.get_directory(
+        reinterpret_cast<directory_iterator *>(handle));
     if (iterator != nullptr) {
       res = iterator->get(static_cast<std::size_t>(offset), item_path);
     } else {