am 2a139c9b: Add more checks to the ping code.

* commit '2a139c9bbc93ec3e81312f795e8f0528783c6beb':
  Add more checks to the ping code.