Remove extraneous null check