Fix possible panic on killing container Upstream-commit: d12593601558ca090864b54e1a2e519f6763e2fb Component: engine