diff --git a/vault/data_identity_entity.go b/vault/data_identity_entity.go
index 14db3ac29..a5ff81d2c 100644
--- a/vault/data_identity_entity.go
+++ b/vault/data_identity_entity.go
@@ -197,16 +197,16 @@ func identityEntityLookup(client *api.Client, data map[string]interface{}) (*api
 	resp, err := client.Logical().Write("identity/lookup/entity", data)
 
 	if err != nil {
-		return nil, fmt.Errorf("Error reading Identity Entity: %s", err)
+		return nil, fmt.Errorf("Error reading Identity Entity '%v': %s", data, err)
 	}
 
 	if resp == nil {
-		return nil, fmt.Errorf("no Identity Entity found")
+		return nil, fmt.Errorf("no Identity Entity found '%v'", data)
 	}
 
 	_, ok := resp.Data["id"]
 	if !ok {
-		return nil, fmt.Errorf("no Identity Entity found")
+		return nil, fmt.Errorf("no Identity Entity found '%v'", data)
 	}
 
 	return resp, nil
diff --git a/vault/data_identity_group.go b/vault/data_identity_group.go
index aeb2df4b5..f87eb5a04 100644
--- a/vault/data_identity_group.go
+++ b/vault/data_identity_group.go
@@ -172,16 +172,16 @@ func identityGroupLookup(client *api.Client, data map[string]interface{}) (*api.
 	resp, err := client.Logical().Write("identity/lookup/group", data)
 
 	if err != nil {
-		return nil, fmt.Errorf("Error reading Identity Group: %s", err)
+		return nil, fmt.Errorf("Error reading Identity Group '%v': %s", data, err)
 	}
 
 	if resp == nil {
-		return nil, fmt.Errorf("no Identity Group found")
+		return nil, fmt.Errorf("no Identity Group found '%v'", data)
 	}
 
 	_, ok := resp.Data["id"]
 	if !ok {
-		return nil, fmt.Errorf("no Identity Group found")
+		return nil, fmt.Errorf("no Identity Group found '%v'", data)
 	}
 
 	return resp, nil