KeyError fix in save_visitor