From ed64f2673deeec9ee35910d4390d41baab7b85e4 Mon Sep 17 00:00:00 2001
From: tombuildsstuff <git@ibuildstuff.co.uk>
Date: Wed, 23 Aug 2017 09:17:41 +0100
Subject: [PATCH] Refactorng

---
 azurerm/resource_arm_app_service_plan.go      |  3 +--
 azurerm/resource_arm_app_service_plan_test.go | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go
index 3e5be240bbc19..deba980ff6af5 100644
--- a/azurerm/resource_arm_app_service_plan.go
+++ b/azurerm/resource_arm_app_service_plan.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"log"
-	"net/http"
 
 	"github.com/Azure/azure-sdk-for-go/arm/web"
 	"github.com/hashicorp/terraform/helper/hashcode"
@@ -141,7 +140,7 @@ func resourceArmAppServicePlanRead(d *schema.ResourceData, meta interface{}) err
 
 	resp, err := AppServicePlanClient.Get(resGroup, name)
 	if err != nil {
-		if resp.StatusCode == http.StatusNotFound {
+		if responseWasNotFound(resp.Response) {
 			d.SetId("")
 			return nil
 		}
diff --git a/azurerm/resource_arm_app_service_plan_test.go b/azurerm/resource_arm_app_service_plan_test.go
index f8cdadf047f20..62f5e52c7e046 100644
--- a/azurerm/resource_arm_app_service_plan_test.go
+++ b/azurerm/resource_arm_app_service_plan_test.go
@@ -104,12 +104,15 @@ func testCheckAzureRMAppServicePlanDestroy(s *terraform.State) error {
 		resp, err := conn.Get(resourceGroup, name)
 
 		if err != nil {
-			return nil
-		}
 
-		if resp.StatusCode != http.StatusNotFound {
-			return fmt.Errorf("App Service Plan still exists:\n%#v", resp)
+			if responseWasNotFound(resp.Response) {
+				return nil
+			}
+
+			return err
 		}
+
+		return fmt.Errorf("App Service Plan still exists:\n%#v", resp)
 	}
 
 	return nil