If container does not exist try to remove the name and continue

Fixes #3066