Merge change 24161 into eclair

* changes:
  don't fling if there's nowhere to go