The `|| null` here is redundant I'd say