Improvement in client logs at shutdown

related to #3493