diff --git a/buzhash.go b/buzhash.go
index b3de95f127507350a5e30f9341297a554c2f6cbc..83ab019dd48c257e9eb2199a56514646209f838e 100644
--- a/buzhash.go
+++ b/buzhash.go
@@ -40,9 +40,16 @@ func (b *Buzhash) NextBytes() ([]byte, error) {
 	n, err := io.ReadFull(b.r, b.buf[b.n:])
 	if err != nil {
 		if err == io.ErrUnexpectedEOF || err == io.EOF {
-			if b.n+n < buzMin {
+			buffered := b.n + n
+			if buffered < buzMin {
 				b.err = io.EOF
-				res := make([]byte, b.n+n)
+				// Read nothing? Don't return an empty block.
+				if buffered == 0 {
+					pool.Put(b.buf)
+					b.buf = nil
+					return nil, b.err
+				}
+				res := make([]byte, buffered)
 				copy(res, b.buf)
 
 				pool.Put(b.buf)
diff --git a/buzhash_test.go b/buzhash_test.go
index f630cef89b77afbaf8cc31e33730336c8d157308..07573bab6b60d80144c6a2b7ad300543ac59c2c9 100644
--- a/buzhash_test.go
+++ b/buzhash_test.go
@@ -2,7 +2,6 @@ package chunk
 
 import (
 	"bytes"
-	"fmt"
 	"io"
 	"testing"
 
@@ -11,33 +10,48 @@ import (
 
 func TestBuzhashChunking(t *testing.T) {
 	data := make([]byte, 1024*1024*16)
-	util.NewTimeSeededRand().Read(data)
 
-	r := NewBuzhash(bytes.NewReader(data))
+	chunkCount := 0
+	rounds := 100
 
-	var chunks [][]byte
+	for i := 0; i < rounds; i++ {
+		util.NewTimeSeededRand().Read(data)
 
-	for {
-		chunk, err := r.NextBytes()
-		if err != nil {
-			if err == io.EOF {
-				break
+		r := NewBuzhash(bytes.NewReader(data))
+
+		var chunks [][]byte
+
+		for {
+			chunk, err := r.NextBytes()
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+				t.Fatal(err)
 			}
-			t.Fatal(err)
+
+			chunks = append(chunks, chunk)
 		}
+		chunkCount += len(chunks)
 
-		chunks = append(chunks, chunk)
-	}
+		for i, chunk := range chunks {
+			if len(chunk) == 0 {
+				t.Fatalf("chunk %d/%d is empty", i+1, len(chunks))
+			}
+		}
 
-	t.Logf("average block size: %d\n", len(data)/len(chunks))
+		for i, chunk := range chunks[:len(chunks)-1] {
+			if len(chunk) < buzMin {
+				t.Fatalf("chunk %d/%d is less than the minimum size", i+1, len(chunks))
+			}
+		}
 
-	unchunked := bytes.Join(chunks, nil)
-	if !bytes.Equal(unchunked, data) {
-		fmt.Printf("%d %d\n", len(unchunked), len(data))
-		//ioutil.WriteFile("./incorrect", unchunked, 0777)
-		//ioutil.WriteFile("./correct", data, 0777)
-		t.Fatal("data was chunked incorrectly")
+		unchunked := bytes.Join(chunks, nil)
+		if !bytes.Equal(unchunked, data) {
+			t.Fatal("data was chunked incorrectly")
+		}
 	}
+	t.Logf("average block size: %d\n", len(data)*rounds/chunkCount)
 }
 
 func TestBuzhashChunkReuse(t *testing.T) {