Maybe a null check would be good as well?