Correcting bug introduced in merge.
Less warnings during shutdown.