fixed a possible null exception
Merge remote-tracking branch 'origin/master'