Maybe better re-throw? I guess it doens't make a big difference here.