I think it's better to make this handle null as well.