implement two changes to better handle, identify, and recover from

No match.