Centralize the check for valid external geometry to ensure consistency (part 2)