t660: more null pointer checking.