t720 -- add null checking
Merge branch 't720' into resolved