Merge "Ensure that the column is valid before querying." into honeycomb