Handle unexpected token -- Related to #1334
Fix for error listener + typo -- Related to #1334
Merge branch 'michel_1334_unexpected_token' into next
Merge branch 'next' into sam_1328