Update to not reutrn null