change on parser for avoid exceptions