Avoid setting None start and end times