More useful exception on unmatched token, some commnent trimming