Added resiliance for temporary inconsistency during shutdown