Merge "Adapt error string for unarchival" into main