and add a `null` check