[Client] Added some safeguards against the never ending walking loop