Add cleanup when container.Start fails

Fixes #1928
Fixes #1829