Becareful with the function addMatch(ADQLObject, ADQLIterator): the iterator may be null if the match to add is the root search object itself! No modification needed in SimpleReplaceHandler: Null test already done :-) !