issue #21448: remove previous client-side implementation of error handling