Fix more possible null refs...