Issue #19304 Prevent crash for error handling until 20264 is done.
Merge branch 'xtuple'
Merge pull request #325 from bendiy/master

Issue #19304 - Prevent crash from inconsistant error handling until 20264 is done.