wrapped sub-objects and containers so as to avoid weird unintended acquisition
accidents.

Also fixed a memory leak in error handling.