#6219: Fix NPE in TM