diff --git a/src/http/http_client.c b/src/http/http_client.c
index e7a0534f..84b64c9c 100644
--- a/src/http/http_client.c
+++ b/src/http/http_client.c
@@ -145,7 +145,8 @@ http_thread ( void *p )
   while (tvheadend_running) {
     n = tvhpoll_wait(http_poll, &ev, 1, -1);
     if (n < 0) {
-      tvherror("http_client", "tvhpoll_wait() error");
+      if (tvheadend_running)
+        tvherror("http_client", "tvhpoll_wait() error");
       break;
     } else {
       pthread_mutex_lock(&http_lock);
diff --git a/src/imagecache.c b/src/imagecache.c
index 36202ada..bc219acd 100644
--- a/src/imagecache.c
+++ b/src/imagecache.c
@@ -222,7 +222,6 @@ imagecache_thread ( void *p )
   }
   pthread_mutex_unlock(&global_lock);
 
-  fprintf(stderr, "imagecache thread end\n");
   return NULL;
 }
 
diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index 9cc1f729..964a81d1 100644
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -266,9 +266,11 @@ iptv_input_thread ( void *aux )
   while ( tvheadend_running ) {
     nfds = tvhpoll_wait(iptv_poll, &ev, 1, -1);
     if ( nfds < 0 ) {
-      tvhlog(LOG_ERR, "iptv", "poll() error %s, sleeping 1 second",
-             strerror(errno));
-      sleep(1);
+      if (tvheadend_running) {
+        tvhlog(LOG_ERR, "iptv", "poll() error %s, sleeping 1 second",
+               strerror(errno));
+        sleep(1);
+      }
       continue;
     } else if ( nfds == 0 ) {
       continue;