Modified handling of dead hosting entities.

Change-Id: Ie3e4c182bdd6627e99c0ab7cddb7d7bd39a7bf11