Added a checkNotNull for VideoEntry and changed accessors with Optional where applicable.