More defensive code around FT update