add checks on dsl parsing