issue #19543: no real progress
issue #19543: revert dispatch try catch
Merge pull request #40 from shackbarth/19543

issue #19543: small fixes but no major progress