Fix 'kill: No such process' messages due to race (mostly seen on 8.x)

Ticket:	[a77d28f62]