CBLT-159:  don't fail when killing zombies

Change-Id: Ifbab42150ec919440d17d656cfff6bbb2f7a066d