Added OID check in Walk()