issue #19051: prevent crash
Merge pull request #109 from shackbarth/19051

issue #19051: prevent crash
Merge pull request #20 from xtuple/master

catch up.