Merge change 21887 into eclair

* changes:
  Fix a crash.