Fixed null? check to nil?