Re: Improve TTMs empty object handling