Use errdefs instead of string contains for checking not found Upstream-commit: 7f6fdce901d51e2692f7d5229d7ba8b4bad6c6a9 Component: engine