Ensure central cleans up storage if the backend fails

Change-Id: I749d8eaf90f24b5bf81412a6d27bee56a86b37a6