added second part of DEATH_PILL handling
Authored by: bittorf 2011-03-09
Parent: [r4835]
Child: [r4837]
