diff --git a/test/test-push.sh b/test/test-push.sh
index 24b99638..be222290 100755
--- a/test/test-push.sh
+++ b/test/test-push.sh
@@ -632,6 +632,7 @@ begin_test "push (with invalid object size)"
   set -e
 
   grep "invalid size (got: -1)" push.log
+  [ "0" -eq "$(grep -c "panic" push.log)" ]
   [ "0" -ne "$res" ]
 
   refute_server_object "$reponame" "$(calc_oid "$contents")"
diff --git a/tq/meter.go b/tq/meter.go
index 0c18599f..a42a2cbb 100644
--- a/tq/meter.go
+++ b/tq/meter.go
@@ -2,6 +2,7 @@ package tq
 
 import (
 	"fmt"
+	"math"
 	"os"
 	"path/filepath"
 	"strings"
@@ -238,8 +239,30 @@ func (m *Meter) str() string {
 		direction,
 		percentage,
 		m.finishedFiles, m.estimatedFiles,
-		humanize.FormatBytes(uint64(m.currentBytes)),
-		humanize.FormatByteRate(uint64(m.avgBytes), time.Second))
+		humanize.FormatBytes(clamp(m.currentBytes)),
+		humanize.FormatByteRate(clampf(m.avgBytes), time.Second))
+}
+
+// clamp clamps the given "x" within the acceptable domain of the uint64 integer
+// type, so as to prevent over- and underflow.
+func clamp(x int64) uint64 {
+	if x < 0 {
+		return 0
+	}
+	if x > math.MaxInt64 {
+		return math.MaxUint64
+	}
+	return uint64(x)
+}
+
+func clampf(x float64) uint64 {
+	if x < 0 {
+		return 0
+	}
+	if x > math.MaxUint64 {
+		return math.MaxUint64
+	}
+	return uint64(x)
 }
 
 func (m *Meter) logBytes(direction, name string, read, total int64) {