revert some changes wtih parseexception being checked