avoid NPE, fix behavior after death