TEIID-3130 preventing npes