Unbreak shutdown sequence for non-errors