diff --git a/src/libs/gocmdbridge/client/bridgedfileaccess.cpp b/src/libs/gocmdbridge/client/bridgedfileaccess.cpp
index 67e864047c7..e81d4aa399c 100644
--- a/src/libs/gocmdbridge/client/bridgedfileaccess.cpp
+++ b/src/libs/gocmdbridge/client/bridgedfileaccess.cpp
@@ -653,7 +653,7 @@ void FileAccess::iterateDirectory(const FilePath &filePath,
     t.start();
 
     while (!result->isFinished()) {
-        if (result->isValid()) {
+        if (result->isValid() && idx < result->resultCount()) {
             result->resultAt(idx);
             // Wait for the next result to become available
             processResults();