Bug squash: clean up race at shutdown that could print an error