Fixed bad handling of "container not found" error Upstream-commit: 478a9462e8776f60c8445972bcb3e506c6e7d413 Component: engine