TEIID-3222 fix to correct join modification
TEIID-3193 accounting for invocation exceptions