In relation to this I found another edge case. At the end of this I was left with one record that had a non indexed field. It was a record with an empty string as value. Apparently this is neither indexed as null (fair enough) nor as anything at all. It's just ignored. Which leads to a npe in the NullEncodingTwoWayFieldBridge. We can probably ignore this as