Fix error handling during directory merge.

Authored by mreeves on Jun 2 2020, 2:33 AM.