Avoid PartitionSelectorException
during refresh
#2179
Merged
PartitionSelectorException
during refresh
#2179