am 19949b9d: Merge "Guard against missing document columns." into klp-dev

* commit '19949b9d3de584b283fa9d1ef2489d3e97a3b41a':
  Guard against missing document columns.