Fixng checkin client dump issue