Merge change 22449 into eclair

* changes:
  Check for a null history item to avoid crashing.