Fix when config null option
Merge remote-tracking branch 'origin/master'