Merge "Update a misleading error log." into main