Can we replace this with a `checkNotNull`? Thoughts @tfm?