diff --git a/google/appengine_operation.go b/google/appengine_operation.go
index f720d7cea6d..deadc29490f 100644
--- a/google/appengine_operation.go
+++ b/google/appengine_operation.go
@@ -59,6 +59,13 @@ func appEngineOperationWait(client *appengine.APIService, op *appengine.Operatio
 }
 
 func appEngineOperationWaitTime(client *appengine.APIService, op *appengine.Operation, appId, activity string, timeoutMin int) error {
+	if op.Done {
+		if op.Error != nil {
+			return AppEngineOperationError(*op.Error)
+		}
+		return nil
+	}
+
 	w := &AppEngineOperationWaiter{
 		Service: client,
 		Op:      op,
diff --git a/google/cloudfunctions_operation.go b/google/cloudfunctions_operation.go
index 34abda6b5c8..d13e0e489c1 100644
--- a/google/cloudfunctions_operation.go
+++ b/google/cloudfunctions_operation.go
@@ -47,6 +47,13 @@ func cloudFunctionsOperationWait(client *cloudfunctions.Service,
 
 func cloudFunctionsOperationWaitTime(client *cloudfunctions.Service, op *cloudfunctions.Operation,
 	activity string, timeoutMin int) error {
+	if op.Done {
+		if op.Error != nil {
+			return fmt.Errorf(op.Error.Message)
+		}
+		return nil
+	}
+
 	w := &CloudFunctionsOperationWaiter{
 		Service: client,
 		Op:      op,
diff --git a/google/compute_operation.go b/google/compute_operation.go
index dc7c23a90fc..1e2e81d7b17 100644
--- a/google/compute_operation.go
+++ b/google/compute_operation.go
@@ -67,6 +67,13 @@ func computeOperationWait(client *compute.Service, op *compute.Operation, projec
 }
 
 func computeOperationWaitTime(client *compute.Service, op *compute.Operation, project, activity string, timeoutMin int) error {
+	if op.Status == "DONE" {
+		if op.Error != nil {
+			return ComputeOperationError(*op.Error)
+		}
+		return nil
+	}
+
 	w := &ComputeOperationWaiter{
 		Service: client,
 		Op:      op,
diff --git a/google/container_operation.go b/google/container_operation.go
index 705b0ed9bec..e3d2338ed47 100644
--- a/google/container_operation.go
+++ b/google/container_operation.go
@@ -80,6 +80,13 @@ func (w *ContainerBetaOperationWaiter) RefreshFunc() resource.StateRefreshFunc {
 }
 
 func containerOperationWait(config *Config, op *container.Operation, project, zone, activity string, timeoutMinutes, minTimeoutSeconds int) error {
+	if op.Status == "DONE" {
+		if op.StatusMessage != "" {
+			return fmt.Errorf(op.StatusMessage)
+		}
+		return nil
+	}
+
 	w := &ContainerOperationWaiter{
 		Service: config.clientContainer,
 		Op:      op,
@@ -92,6 +99,13 @@ func containerOperationWait(config *Config, op *container.Operation, project, zo
 }
 
 func containerBetaOperationWait(config *Config, op *containerBeta.Operation, project, location, activity string, timeoutMinutes, minTimeoutSeconds int) error {
+	if op.Status == "DONE" {
+		if op.StatusMessage != "" {
+			return fmt.Errorf(op.StatusMessage)
+		}
+		return nil
+	}
+
 	w := &ContainerBetaOperationWaiter{
 		Service:  config.clientContainerBeta,
 		Op:       op,
diff --git a/google/dataproc_cluster_operation.go b/google/dataproc_cluster_operation.go
index 9120067bb30..cefd2fde531 100644
--- a/google/dataproc_cluster_operation.go
+++ b/google/dataproc_cluster_operation.go
@@ -37,6 +37,13 @@ func (w *DataprocClusterOperationWaiter) RefreshFunc() resource.StateRefreshFunc
 }
 
 func dataprocClusterOperationWait(config *Config, op *dataproc.Operation, activity string, timeoutMinutes, minTimeoutSeconds int) error {
+	if op.Done {
+		if op.Error != nil {
+			return fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return nil
+	}
+
 	w := &DataprocClusterOperationWaiter{
 		Service: config.clientDataproc,
 		Op:      op,
diff --git a/google/dns_operation.go b/google/dns_operation.go
index 98ac3aa82e7..92c5c3bd98c 100644
--- a/google/dns_operation.go
+++ b/google/dns_operation.go
@@ -2,10 +2,11 @@ package google
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/resource"
-	"google.golang.org/api/dns/v1beta2"
 	"log"
 	"time"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"google.golang.org/api/dns/v1beta2"
 )
 
 type DnsOperationWaiter struct {
@@ -48,6 +49,10 @@ func dnsOperationWait(service *dns.Service, op *dns.Operation, project, activity
 }
 
 func dnsOperationWaitTime(service *dns.Service, op *dns.Operation, project, activity string, timeoutMin int) error {
+	if op.Status == "done" {
+		return nil
+	}
+
 	w := &DnsOperationWaiter{
 		Service: service.ManagedZoneOperations,
 		Op:      op,
diff --git a/google/resourcemanager_operation.go b/google/resourcemanager_operation.go
index 8d263be16fb..239730ed330 100644
--- a/google/resourcemanager_operation.go
+++ b/google/resourcemanager_operation.go
@@ -42,6 +42,13 @@ func resourceManagerOperationWait(service *cloudresourcemanager.Service, op *clo
 }
 
 func resourceManagerOperationWaitTime(service *cloudresourcemanager.Service, op *cloudresourcemanager.Operation, activity string, timeoutMin int) error {
+	if op.Done {
+		if op.Error != nil {
+			return fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return nil
+	}
+
 	w := &ResourceManagerOperationWaiter{
 		Service: service,
 		Op:      op,
diff --git a/google/serviceman_operation.go b/google/serviceman_operation.go
index 63e74029f8e..3e858cfaa1b 100644
--- a/google/serviceman_operation.go
+++ b/google/serviceman_operation.go
@@ -45,6 +45,13 @@ func serviceManagementOperationWait(config *Config, op *servicemanagement.Operat
 }
 
 func serviceManagementOperationWaitTime(config *Config, op *servicemanagement.Operation, activity string, timeoutMin int) (googleapi.RawMessage, error) {
+	if op.Done {
+		if op.Error != nil {
+			return nil, fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return op.Response, nil
+	}
+
 	w := &ServiceManagementOperationWaiter{
 		Service: config.clientServiceMan,
 		Op:      op,
diff --git a/google/serviceusage_operation.go b/google/serviceusage_operation.go
index deb5b8b23f1..65a6b212ec2 100644
--- a/google/serviceusage_operation.go
+++ b/google/serviceusage_operation.go
@@ -45,6 +45,13 @@ func serviceUsageOperationWait(config *Config, op *serviceusage.Operation, activ
 }
 
 func serviceUsageOperationWaitTime(config *Config, op *serviceusage.Operation, activity string, timeoutMin int) (googleapi.RawMessage, error) {
+	if op.Done {
+		if op.Error != nil {
+			return nil, fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return op.Response, nil
+	}
+
 	w := &serviceUsageOperationWaiter{
 		Service: config.clientServiceUsage,
 		Op:      op,
diff --git a/google/spanner_database_operation.go b/google/spanner_database_operation.go
index eb18fe7a745..03711820d23 100644
--- a/google/spanner_database_operation.go
+++ b/google/spanner_database_operation.go
@@ -38,6 +38,13 @@ func (w *SpannerDatabaseOperationWaiter) RefreshFunc() resource.StateRefreshFunc
 }
 
 func spannerDatabaseOperationWait(config *Config, op *spanner.Operation, activity string, timeoutMin int) error {
+	if op.Done {
+		if op.Error != nil {
+			return fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return nil
+	}
+
 	w := &SpannerDatabaseOperationWaiter{
 		Service: config.clientSpanner,
 		Op:      op,
diff --git a/google/spanner_instance_operation.go b/google/spanner_instance_operation.go
index afe88e1eadf..4a83c3aaf18 100644
--- a/google/spanner_instance_operation.go
+++ b/google/spanner_instance_operation.go
@@ -38,6 +38,13 @@ func (w *SpannerInstanceOperationWaiter) RefreshFunc() resource.StateRefreshFunc
 }
 
 func spannerInstanceOperationWait(config *Config, op *spanner.Operation, activity string, timeoutMin int) error {
+	if op.Done {
+		if op.Error != nil {
+			return fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return nil
+	}
+
 	w := &SpannerInstanceOperationWaiter{
 		Service: config.clientSpanner,
 		Op:      op,
diff --git a/google/sqladmin_operation.go b/google/sqladmin_operation.go
index bc99f7e46cc..a35d28d2b31 100644
--- a/google/sqladmin_operation.go
+++ b/google/sqladmin_operation.go
@@ -61,6 +61,13 @@ func sqladminOperationWait(config *Config, op *sqladmin.Operation, project, acti
 }
 
 func sqladminOperationWaitTime(config *Config, op *sqladmin.Operation, project, activity string, timeoutMinutes int) error {
+	if op.Status == "DONE" {
+		if op.Error != nil {
+			return SqlAdminOperationError(*op.Error)
+		}
+		return nil
+	}
+
 	w := &SqlAdminOperationWaiter{
 		Service: config.clientSqlAdmin,
 		Op:      op,