Fix more NPE