issue #19543: revert dispatch try catch