diff --git a/src/cmd/dist/util.go b/src/cmd/dist/util.go
index 28fe5e1d8d..8856f467d5 100644
--- a/src/cmd/dist/util.go
+++ b/src/cmd/dist/util.go
@@ -172,6 +172,9 @@ func bgwait(wg *sync.WaitGroup) {
 	select {
 	case <-done:
 	case <-dying:
+		// Don't return to the caller, to avoid reporting additional errors
+		// to the user.
+		select {}
 	}
 }