Slightly improve error messages, line/statment numbers are still off by one
Slightly improve error messages, line/statment numbers are still off by one

mrrrgn/glowing-guacamole,mrrrgn/glowing-guacamole