Fix more null string checks