Fix walk logic
Avoid null exception