Improve TTMs empty object handling