Fixed NullPointerException on entity death