Bug fix:  Finish on FIX_ERROR_PATH threw concurrent modificatoin error.