diff --git a/options.go b/options.go
index a7f7fd76..bab7d4d5 100644
--- a/options.go
+++ b/options.go
@@ -3,6 +3,7 @@ package redis
 import (
 	"crypto/tls"
 	"errors"
+	"fmt"
 	"net"
 	"net/url"
 	"strconv"
@@ -151,7 +152,7 @@ func ParseURL(redisURL string) (*Options, error) {
 		o.DB = 0
 	case 1:
 		if o.DB, err = strconv.Atoi(f[0]); err != nil {
-			return nil, errors.New("invalid redis database number: " + err.Error())
+			return nil, fmt.Errorf("invalid redis database number: %q", f[0])
 		}
 	default:
 		return nil, errors.New("invalid redis URL path: " + u.Path)
diff --git a/options_test.go b/options_test.go
index effebd5a..6a4af716 100644
--- a/options_test.go
+++ b/options_test.go
@@ -63,7 +63,7 @@ func TestParseURL(t *testing.T) {
 		{
 			"redis://localhost/iamadatabase",
 			"",
-			0, false, errors.New("invalid redis database number: strconv.ParseInt: parsing \"iamadatabase\": invalid syntax"),
+			0, false, errors.New(`invalid redis database number: "iamadatabase"`),
 		},
 	}