server.go

diff --git a/openstack/resource_openstack_compute_instance_v2.go b/openstack/resource_openstack_compute_instance_v2.go
index c10bbbf..6ef75f4 100644
--- a/openstack/resource_openstack_compute_instance_v2.go
+++ b/openstack/resource_openstack_compute_instance_v2.go
@@ -890,7 +890,7 @@ func resourceComputeInstanceV2Delete(d *schema.ResourceData, meta interface{}) e
        if d.Get("stop_before_destroy").(bool) {
                err = startstop.Stop(computeClient, d.Id()).ExtractErr()
                if err != nil {
-                       log.Printf("[WARN] Error stopping OpenStack instance: %s", err)
+                       return CheckDeleted(d, err, "Error stopping openstack_compute_instance_v2")
                } else {
                        stopStateConf := &resource.StateChangeConf{
                                Pending:    []string{"ACTIVE"},
@@ -912,13 +912,13 @@ func resourceComputeInstanceV2Delete(d *schema.ResourceData, meta interface{}) e
                log.Printf("[DEBUG] Force deleting OpenStack Instance %s", d.Id())
                err = servers.ForceDelete(computeClient, d.Id()).ExtractErr()
                if err != nil {
-                       return fmt.Errorf("Error deleting OpenStack server: %s", err)
+                       return CheckDeleted(d, err, "Error deleting openstack_compute_instance_v2")
                }
        } else {
                log.Printf("[DEBUG] Deleting OpenStack Instance %s", d.Id())
                err = servers.Delete(computeClient, d.Id()).ExtractErr()
                if err != nil {
-                       return fmt.Errorf("Error deleting OpenStack server: %s", err)
+                       return CheckDeleted(d, err, "Error deleting openstack_compute_instance_v2")
                }
        }
 
@@ -941,7 +941,6 @@ func resourceComputeInstanceV2Delete(d *schema.ResourceData, meta interface{}) e
                        d.Id(), err)
        }
 
-       d.SetId("")
        return nil
 }