removed an extraneous null guard