Check setting type before json_decode
Merge branch 'hotfix/1.2.1'