Fix NoneType error in watch list