I assume you meant "Failing to remove an empty directory for one component should **not** cause us to give up trying to delete empty directories for other components." If so, I agree. And  f7ab7fa looks good