Do not generate ParseException as it has been customized (#12937)

Reverted ParseException to the previous version

Change-Id: Ic89eb4b65d1a78f40c4cb94e9b2a13a3250c1924