fix npe
update for changes to tc model