Fix directory walker error checking Upstream-commit: 6e721f6432da2fb6976b9c1cee41e15797cf6906 Component: engine