diff --git a/azurerm/resource_arm_monitor_diagnostics.go b/azurerm/resource_arm_monitor_diagnostics.go
index b69b4fb6abda0..4e99c992a6b0f 100644
--- a/azurerm/resource_arm_monitor_diagnostics.go
+++ b/azurerm/resource_arm_monitor_diagnostics.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights"
+	"github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
@@ -123,7 +123,7 @@ func resourceArmMonitorDiagnosticsCreate(d *schema.ResourceData, meta interface{
 		},
 		name)
 	if err != nil {
-		return err
+		return fmt.Errorf("Error creating Diagnostics Setting %q (Resource ID %q): %+v", name, targetResourceId, err)
 	}
 
 	read, err := client.Get(ctx, targetResourceId, name)
@@ -131,7 +131,7 @@ func resourceArmMonitorDiagnosticsCreate(d *schema.ResourceData, meta interface{
 		return err
 	}
 	if read.ID == nil {
-		return fmt.Errorf("Cannot read Diagnostic Settings")
+		return fmt.Errorf("Cannot read ID for Monitor Diagnostics %q", name)
 	}
 
 	d.SetId(*read.ID)