Added more parser checks