Store all countries in visit, add error handling