diff --git a/pool/strings.go b/pool/strings.go
index 51f893b..5979720 100644
--- a/pool/strings.go
+++ b/pool/strings.go
@@ -79,6 +79,9 @@ func (s String) MustReset() {
 }
 
 func (s String) WriteString(str string) (int, error) {
+	if str == "" {
+		return 0, nil
+	}
 	if s.Builder == nil {
 		return 0, ErrBufferReturned
 	}
@@ -87,12 +90,15 @@ func (s String) WriteString(str string) (int, error) {
 
 // MustWriteString means Must Write String, like WriteString but will panic on error.
 func (s String) MustWriteString(str string) {
+	if str == "" {
+		return
+	}
 	if s.Builder == nil {
 		panic(ErrBufferReturned)
 	}
-	if str == "" {
+	/*	if str == "" {
 		panic("nil string")
-	}
+	}*/
 	_, _ = s.Builder.WriteString(str)
 }
 
@@ -100,21 +106,21 @@ func (s String) Write(p []byte) (int, error) {
 	if s.Builder == nil {
 		return 0, ErrBufferReturned
 	}
-	return s.Builder.Write(p)
+	return s.Builder.Write(p) //nolint:wrapcheck
 }
 
 func (s String) WriteRune(r rune) (int, error) {
 	if s.Builder == nil {
 		return 0, ErrBufferReturned
 	}
-	return s.Builder.WriteRune(r)
+	return s.Builder.WriteRune(r) //nolint:wrapcheck
 }
 
 func (s String) WriteByte(c byte) error {
 	if s.Builder == nil {
 		return ErrBufferReturned
 	}
-	return s.Builder.WriteByte(c)
+	return s.Builder.WriteByte(c) //nolint:wrapcheck
 }
 
 func (s String) Len() int {
diff --git a/pool/strings_test.go b/pool/strings_test.go
index b028a1f..738667a 100644
--- a/pool/strings_test.go
+++ b/pool/strings_test.go
@@ -17,6 +17,7 @@ func assertPanic(t *testing.T, f func()) {
 }
 
 func TestStringFactoryPanic(t *testing.T) {
+	t.Parallel()
 	sf := NewStringFactory()
 	t.Run("StringsMustWrite", func(t *testing.T) {
 		buf := sf.Get()
@@ -29,19 +30,21 @@ func TestStringFactoryPanic(t *testing.T) {
 		}
 	})
 	t.Run("StringsMustWritePanic", func(t *testing.T) {
+		t.Parallel()
 		var badString *string = nil
 		buf := sf.Get()
 		assertPanic(t, func() {
 			buf.MustWriteString(*badString)
 		})
-		assertPanic(t, func() {
-			buf.MustWriteString("")
-		})
+		/*		assertPanic(t, func() {
+				buf.MustWriteString("")
+			})*/
 		if err := sf.Put(buf); err != nil {
 			t.Fatalf("The buffer was not returned: %v", err)
 		}
 	})
 	t.Run("StringsMustString", func(t *testing.T) {
+		t.Parallel()
 		buf := sf.Get()
 		buf.MustWriteString("hello world")
 		if buf.MustString() != "hello world" {
@@ -53,6 +56,7 @@ func TestStringFactoryPanic(t *testing.T) {
 		})
 	})
 	t.Run("StringsMust", func(t *testing.T) {
+		t.Parallel()
 		buf := sf.Get()
 		buf.MustReset()
 		_ = buf.MustLen()
@@ -80,6 +84,7 @@ func TestStringFactoryPanic(t *testing.T) {
 }
 
 func TestStringFactory(t *testing.T) {
+	t.Parallel()
 	s := NewStringFactory()
 	t.Run("StringPoolHelloWorld", func(t *testing.T) {
 		t.Parallel()
@@ -214,4 +219,29 @@ func TestStringFactory(t *testing.T) {
 			t.Fatalf("should not be able to write to a returned buffer")
 		}
 	})
+	t.Run("StringFactoryMustNotPanicOnEmptyString", func(t *testing.T) {
+		t.Parallel()
+		got := s.Get()
+		n, err := got.WriteString("")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if n != 0 {
+			t.Fatalf("expected 0, got %d", n)
+		}
+		if str := got.String(); str != "" {
+			t.Fatalf("expected empty string, got %s", str)
+		}
+		if err := s.Put(got); err != nil {
+			t.Fatal(err)
+		}
+		got = s.Get()
+		defer func() {
+			if r := recover(); r != nil {
+				t.Fatalf("unexpected panic: %v", r)
+			}
+		}()
+		got.MustWriteString("")
+		s.MustPut(got)
+	})
 }