Fix internals spilled out on error