Merge "Avoid fatals in begin/commit/rollback if close() was called"