Merge "Guard against missing document columns." into klp-dev