maybe remove this rescue/re-throw?  I'm not sure it adds much.