Merge pull request #1900 from terraform-providers/azurestack-subnet

subnet data source: small fix to error handling

azurerm/data_source_subnet.go

@@ -60,18 +60,13 @@ func dataSourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error {
 	resourceGroup := d.Get("resource_group_name").(string)
 
 	resp, err := client.Get(ctx, resourceGroup, virtualNetworkName, name, "")
-	if err != nil {
-		return fmt.Errorf("Error reading Subnet: %+v", err)
-	}
-
-	d.SetId(*resp.ID)
-
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
 			return fmt.Errorf("Error: Subnet %q (Virtual Network %q / Resource Group %q) was not found", name, resourceGroup, virtualNetworkName)
 		}
 		return fmt.Errorf("Error making Read request on Azure Subnet %q: %+v", name, err)
 	}
+	d.SetId(*resp.ID)
 
 	d.Set("name", name)
 	d.Set("resource_group_name", resourceGroup)