Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term

Add error check before getting term