Fix additional nullref issues