TEIID-2956 addressing npe