fixed a bug about null check
Merge branch 'uidev'