add error escape for token
Merge remote-tracking branch 'origin/master'