Improved error location
Improved error location