TEIID-2468 return null rather than throw an npe