Added better error messages in parsers