Fix the logic for handling invalid duchy capitals (#2461)

Fix the logic for handling invalid duchy capitals (#2461) #1871