Fix death NPE