t716 fixed NPE