Pair error handler restoration properly#5

jtojnar wants to merge 1 commit intoddeboer:masterddeboer/transcoder:masterfrom

jtojnar:pair-error-handler-restorationjtojnar/transcoder:pair-error-handler-restorationCopy head branch name to clipboard