diff --git a/client/snowflake.go b/client/snowflake.go
index 105fd30..e0f9746 100644
--- a/client/snowflake.go
+++ b/client/snowflake.go
@@ -241,11 +241,8 @@ func main() {
 		ln.Close()
 	}
 	snowflakes.End()
-	for n := range handlerChan {
-		numHandlers += n
-		if numHandlers == 0 {
-			break
-		}
+	for numHandlers > 0 {
+		numHandlers += <-handlerChan
 	}
 	log.Println("snowflake is done.")
 }
diff --git a/server/server.go b/server/server.go
index 0136fc0..7c5a205 100644
--- a/server/server.go
+++ b/server/server.go
@@ -393,10 +393,7 @@ func main() {
 	for _, server := range servers {
 		server.Close()
 	}
-	for n := range handlerChan {
-		numHandlers += n
-		if numHandlers == 0 {
-			break
-		}
+	for numHandlers > 0 {
+		numHandlers += <-handlerChan
 	}
 }