Moving death check from here to address issue #6293