Minor error handling
Unit tests  for Matched Names Save Match