diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go
index 540085450d..eb6d369793 100644
--- a/core/bloombits/generator.go
+++ b/core/bloombits/generator.go
@@ -80,8 +80,8 @@ func (b *Generator) Bitset(idx uint) ([]byte, error) {
 	if b.nextBit != b.sections {
 		return nil, errors.New("bloom not fully generated yet")
 	}
-	if idx >= b.sections {
-		return nil, errSectionOutOfBounds
+	if idx >= types.BloomBitLength {
+		return nil, errors.New("bloom bit out of bounds")
 	}
 	return b.blooms[idx], nil
 }
diff --git a/ethdb/database_test.go b/ethdb/database_test.go
index 50386f41e9..74675cbe63 100644
--- a/ethdb/database_test.go
+++ b/ethdb/database_test.go
@@ -78,7 +78,7 @@ func testPutGet(db ethdb.Database, t *testing.T) {
 
 	_, err := db.Get([]byte("non-exist-key"))
 	if err == nil {
-		t.Fatalf("expect to return a non found error")
+		t.Fatalf("expect to return a not found error")
 	}
 
 	for _, v := range test_values {