Add checkNotNull to constructor args