Merge change 27134 into eclair

* changes:
  Make sure we don't get an Out of bounds exception when getting a section.