Fix EOF token crash
Merge pull request #486 from acoomans/fix

Fix EOF token crash