instead of dealing with null, can we make this an Option instead?