Fix behavior when removal fails.
2 files changed