Revert unnecessary error conversion