Fix bug for situation where no suitable index location is found.

[SVN r84180]
Merge branch 'develop'