diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index 42407fca..9e4375ab 100644
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -203,9 +203,11 @@ iptv_input_start_mux ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi )
 
   /* Start */
   pthread_mutex_lock(&iptv_lock);
-  im->mm_active  = mmi;
-  im->im_handler = ih;
   ret            = ih->start(im, &url);
+  if (!ret) {
+    im->mm_active  = mmi;
+    im->im_handler = ih;
+  }
   pthread_mutex_unlock(&iptv_lock);
 
   return ret;
diff --git a/src/input/mpegts/iptv/iptv_udp.c b/src/input/mpegts/iptv/iptv_udp.c
index 8b89a879..3728af66 100644
--- a/src/input/mpegts/iptv/iptv_udp.c
+++ b/src/input/mpegts/iptv/iptv_udp.c
@@ -51,7 +51,7 @@ iptv_udp_start ( iptv_mux_t *im, const url_t *url )
   struct in6_addr s6addr;
   char name[256], buf[256];
 
-  im->mm_display_name((mpegts_mux_t*)im, buf, sizeof(buf));
+  im->mm_display_name((mpegts_mux_t*)im, name, sizeof(name));
 
   /* Determine if this is IPv6 */
   if (!inet_pton(AF_INET, url->host, &saddr)) {