diff --git a/builtin/providers/postgresql/config.go b/builtin/providers/postgresql/config.go
index cef6f27106..2b45904fcf 100644
--- a/builtin/providers/postgresql/config.go
+++ b/builtin/providers/postgresql/config.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 	"unicode"
 
+	"github.com/hashicorp/errwrap"
 	_ "github.com/lib/pq" //PostgreSQL db
 )
 
@@ -89,7 +90,7 @@ func (c *Config) NewClient() (*Client, error) {
 func (c *Client) Connect() (*sql.DB, error) {
 	db, err := sql.Open("postgres", c.connStr)
 	if err != nil {
-		return nil, fmt.Errorf("Error connecting to PostgreSQL server: %v", err)
+		return nil, errwrap.Wrapf("Error connecting to PostgreSQL server: {{err}}", err)
 	}
 
 	return db, nil
diff --git a/builtin/providers/postgresql/resource_postgresql_role.go b/builtin/providers/postgresql/resource_postgresql_role.go
index 382ed6f081..5e1c95f708 100644
--- a/builtin/providers/postgresql/resource_postgresql_role.go
+++ b/builtin/providers/postgresql/resource_postgresql_role.go
@@ -374,7 +374,7 @@ func resourcePostgreSQLRoleReadImpl(d *schema.ResourceData, meta interface{}) er
 	err = conn.QueryRow("SELECT COALESCE(passwd, '') FROM pg_catalog.pg_shadow AS s WHERE s.usename = $1", roleId).Scan(&rolePassword)
 	switch {
 	case err == sql.ErrNoRows:
-		return fmt.Errorf("PostgreSQL role (%s) not found in shadow database: {{err}}", roleId)
+		return errwrap.Wrapf(fmt.Errorf("PostgreSQL role (%s) not found in shadow database: {{err}}", roleId), err)
 	case err != nil:
 		return errwrap.Wrapf("Error reading role: {{err}}", err)
 	default: