I committed the fix to catch both errors, but if this turns out not to be a good idea, please re-open this bug!
I committed the fix to catch both errors, but if this turns out not to be a good idea, please re-open this bug!