Maybe null return not needed in this case, but I think it's a good idea in general