When failing, provide with the incomplete parsetree
Correctly handle internal names
Improve error message