Fix redundant null check & adds properly qualified access