CS
Changed parser error handling. Exception not needed there.
resolve todo