Merge "Fix a misleading error message." into main