Fix exception when bucket cleanup fails

Change-Id: I376bdf806d98e83f1f9ea87fdc2a9254e270da9f