diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
index ded3b14d47..2720f72d36 100644
--- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
@@ -709,6 +709,9 @@ BPlusTree::Validate(bool repair, bool& _errorsFound)
 		if (check.Visited(freeOffset)) {
 			dprintf("inode %" B_PRIdOFF ": free node at %" B_PRIdOFF
 				" circular!\n", fStream->ID(), freeOffset);
+			// TODO: if 'repair' is true, we could collect all unvisited nodes
+			// at the end, and put the into the free list
+			check.FoundError();
 			break;
 		}