Fix NPE with TP system