Fix for get_name error.  Added more diagnostic files to grab.