diff --git a/common/bit_array.go b/common/bit_array.go
index 7cc84705e..a3a87ccab 100644
--- a/common/bit_array.go
+++ b/common/bit_array.go
@@ -15,7 +15,7 @@ type BitArray struct {
 
 // There is no BitArray whose Size is 0.  Use nil instead.
 func NewBitArray(bits int) *BitArray {
-	if bits == 0 {
+	if bits <= 0 {
 		return nil
 	}
 	return &BitArray{
diff --git a/common/bit_array_test.go b/common/bit_array_test.go
index 94a312b7e..fbc438cd1 100644
--- a/common/bit_array_test.go
+++ b/common/bit_array_test.go
@@ -208,3 +208,10 @@ func TestUpdateNeverPanics(t *testing.T) {
 		b.Update(a)
 	}
 }
+
+func TestNewBitArrayNeverCrashesOnNegatives(t *testing.T) {
+	bitList := []int{-127, -128, -1<<31}
+	for _, bits := range bitList {
+		_ = NewBitArray(bits)
+	}
+}