am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"

* commit '2f463ef18bb235be57b39cbda536bcd2df2d0908':
  Adding a sanity test in the while loop in readHistory()