BZ 1089757 - fix is shutdown code