I can't seem now to reproduce this, due to fixes made elsewhere. But this patch seems sensible anyway, since exceptions can be thrown in the code surrounded. Still, I'm not that familiar with C++ exception handling, so I'd appreciate it if someone could let me know if this is OK.
rh
