Wrap with try/finally here?