TEIID-3202 correcting for null