master
Fixed error messages in parser