Not sure what the right behavior is here. If rebuilding our journal fails, the cache is wedged.

(Your change is good because it makes that problem obvious; previously it was invisible)