diff --git a/src/kits/storage/Directory.cpp b/src/kits/storage/Directory.cpp
index b598832bab..33741683f0 100644
--- a/src/kits/storage/Directory.cpp
+++ b/src/kits/storage/Directory.cpp
@@ -338,6 +338,8 @@ BDirectory::GetNextEntry(BEntry* entry, bool traverse)
 		if (error == B_OK)
 			error = entry->SetTo(&ref, traverse);
 	}
+	if (error != B_OK && entry != NULL)
+		entry->Unset();
 	return error;
 }