Do we need `checkNotNull` here and in similar places?