issue #19379: getting a better handle on errors
Merge pull request #29 from shackbarth/19379

issue #19379: getting a better handle on errors