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

* commit 'f7eb3398f16f4d76d2a342cf571040360d5a6df6':
  Guard against missing document columns.