I think we should leave it then.  Jim convinced me that catching and rethrowing is rarely a good idea in python, since it can mess up the traceback and make it harder to diagnose problems.  Not a big difference in the traceback here of course, but for an "either way" case, I think we should just leave it.