diff --git a/main/reentrancy.c b/main/reentrancy.c
index c180a5af2b6..4677d52ea20 100644
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -108,8 +108,10 @@ PHPAPI int php_readdir_r(DIR *dirp, struct dirent *entry,
 	
 	if (ret == 0)
 		*result = entry;
-	else
+	else if (errno == 0) {
 		*result = NULL;
+		ret = 0;
+	}
 
 	return ret;
 #else