am 00a34ab5: Merge "Protect against null detail record." into mnc-dev

* commit '00a34ab54c0e53461586c9596b4f43615319329f':
  Protect against null detail record.