Cleanup client not found errors Upstream-commit: bb0e8ee51c8940c3ce23e4f594068612203c6139 Component: engine