> I suspect we need to check the exception > type and > either re-throw it or (if a memory error) wrap it.
Yes, this is what I was thinking about, too. I was just worried about performance and library size issues when modifying this (library wide used) macro, but I think change will not have significant (negative) impact.