Support SyntaxError
Merge branch 'master' into implement-policies