Re-re-merge the check of NotValidException