TEIID-2505 correcting count logic and widening what gets logged as an
error