Fix error handling with not-exist errors on remove Upstream-commit: 67eeb0490d9beacbd6e00eb4ea20cfe692ebf333 Component: engine
Fix error handling with not-exist errors on remove Upstream-commit: 67eeb0490d9beacbd6e00eb4ea20cfe692ebf333 Component: engine