diff --git a/docs/source/tutorials/live.rst b/docs/source/tutorials/live.rst
index 9d6b5050dc..8cbb563f42 100644
--- a/docs/source/tutorials/live.rst
+++ b/docs/source/tutorials/live.rst
@@ -33,7 +33,8 @@ Here are some examples.
       'in=udp://225.1.1.8:8002?interface=172.29.46.122,stream=video,init_segment=h264_480p_init.mp4,segment_template=h264_480p_$Number$.m4s,playlist_name=h264_480p.m3u8' \
       'in=udp://225.1.1.8:8003?interface=172.29.46.122,stream=video,init_segment=h264_720p_init.mp4,segment_template=h264_720p_$Number$.m4s,playlist_name=h264_720p.m3u8' \
       'in=udp://225.1.1.8:8004?interface=172.29.46.122,stream=video,init_segment=h264_1080p_init.mp4,segment_template=h264_1080p_$Number$.m4s,playlist_name=h264_1080p.m3u8' \
-      --hls_master_playlist_output h264_master.m3u8
+      --hls_master_playlist_output h264_master.m3u8 \
+      --hls_playlist_type LIVE
 
 .. note::
 
diff --git a/packager/packager.cc b/packager/packager.cc
index 2a34f5c13f..61dd769332 100644
--- a/packager/packager.cc
+++ b/packager/packager.cc
@@ -213,10 +213,7 @@ Status ValidateStreamDescriptor(bool dump_stream_info,
 
   // If a segment template is provided, it must be valid.
   if (stream.segment_template.length()) {
-    Status template_check = ValidateSegmentTemplate(stream.segment_template);
-    if (!template_check.ok()) {
-      return template_check;
-    }
+    RETURN_IF_ERROR(ValidateSegmentTemplate(stream.segment_template));
   }
 
   // There are some specifics that must be checked based on which format
@@ -292,11 +289,22 @@ Status ValidateParams(const PackagingParams& packaging_params,
                     "stream descriptors.");
     }
 
-    Status stream_check = ValidateStreamDescriptor(
-        packaging_params.test_params.dump_stream_info, descriptor);
+    RETURN_IF_ERROR(ValidateStreamDescriptor(
+        packaging_params.test_params.dump_stream_info, descriptor));
 
-    if (!stream_check.ok()) {
-      return stream_check;
+    if (base::StartsWith(descriptor.input, "udp://",
+                         base::CompareCase::SENSITIVE)) {
+      const HlsParams& hls_params = packaging_params.hls_params;
+      if (!hls_params.master_playlist_output.empty() &&
+          hls_params.playlist_type == HlsPlaylistType::kVod) {
+        LOG(WARNING)
+            << "Seeing UDP input with HLS Playlist Type set to VOD. The "
+               "playlists will only be generated when UDP socket is closed. "
+               "If you want to do live packaging, --hls_playlist_type needs to "
+               "be set to LIVE.";
+      }
+      // Skip the check for DASH as DASH defaults to 'dynamic' MPD when segment
+      // template is provided.
     }
   }
 
@@ -836,11 +844,7 @@ Status Packager::Initialize(
   if (internal_)
     return Status(error::INVALID_ARGUMENT, "Already initialized.");
 
-  Status param_check =
-      media::ValidateParams(packaging_params, stream_descriptors);
-  if (!param_check.ok()) {
-    return param_check;
-  }
+  RETURN_IF_ERROR(media::ValidateParams(packaging_params, stream_descriptors));
 
   if (!packaging_params.test_params.injected_library_version.empty()) {
     SetPackagerVersionForTesting(
@@ -945,15 +949,11 @@ Status Packager::Initialize(
       packaging_params.output_media_info, internal->mpd_notifier.get(),
       internal->hls_notifier.get());
 
-  Status status = media::CreateAllJobs(
+  RETURN_IF_ERROR(media::CreateAllJobs(
       streams_for_jobs, packaging_params, internal->mpd_notifier.get(),
       internal->encryption_key_source.get(),
       internal->job_manager->sync_points(), &muxer_listener_factory,
-      &muxer_factory, internal->job_manager.get());
-
-  if (!status.ok()) {
-    return status;
-  }
+      &muxer_factory, internal->job_manager.get()));
 
   internal_ = std::move(internal);
   return Status::OK;
@@ -963,9 +963,7 @@ Status Packager::Run() {
   if (!internal_)
     return Status(error::INVALID_ARGUMENT, "Not yet initialized.");
 
-  Status status = internal_->job_manager->RunJobs();
-  if (!status.ok())
-    return status;
+  RETURN_IF_ERROR(internal_->job_manager->RunJobs());
 
   if (internal_->hls_notifier) {
     if (!internal_->hls_notifier->Flush())