Add error check before getting term Upstream-commit: 2c4fe2aba3adc4416d09e76e669341e2217ae894 Component: engine