for now, the effect is the same, and we may want to move the return
back to the common part if we want to handle multiple exceptions
in a unified matter.  But at the moment we don't have the need for it,
and the revised position seemed to be less confusing.