Adding additional parse checking logic

Adding additional parse checking logic #3039