Merge commit 'c165376408804893c2f086282850862371910aed' * commit 'c165376408804893c2f086282850862371910aed': Add a null checking to avoid crash.
Merge commit 'c165376408804893c2f086282850862371910aed' * commit 'c165376408804893c2f086282850862371910aed': Add a null checking to avoid crash.