diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go
index 4576f24c..7c4c8418 100644
--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -277,6 +277,7 @@ func _main(background context.Context, args []string) int {
 	<-serverDone
 	<-unboundDone
 	<-openvpnDone
+	<-tinyproxyDone
 	return exitStatus
 }
 
diff --git a/internal/dns/loop.go b/internal/dns/loop.go
index ecd7cc86..45d16405 100644
--- a/internal/dns/loop.go
+++ b/internal/dns/loop.go
@@ -2,7 +2,6 @@ package dns
 
 import (
 	"context"
-	"fmt"
 	"net"
 	"time"
 
@@ -112,7 +111,7 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
 		go func() {
 			err := waitFn() // blocking
 			if unboundCtx.Err() != context.Canceled {
-				waitError <- fmt.Errorf("unbound: %w", err)
+				waitError <- err
 			}
 		}()
 
diff --git a/internal/openvpn/loop.go b/internal/openvpn/loop.go
index 768b80ea..f7f24c7d 100644
--- a/internal/openvpn/loop.go
+++ b/internal/openvpn/loop.go
@@ -2,7 +2,6 @@ package openvpn
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/qdm12/golibs/command"
@@ -62,7 +61,7 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
 		go func() {
 			err := waitFn() // blocking
 			if openvpnCtx.Err() != context.Canceled {
-				waitError <- fmt.Errorf("openvpn: %w", err)
+				waitError <- err
 			}
 		}()
 		select {