Add a 'checkNotNull` here?