diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d6432d20..6209b256f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ BUG FIXES:
   * core: If a resource fails to create and has provisioners, it is
       marked as tainted. [GH-434]
   * core: Set types are validated to be sets. [GH-413]
+  * core: Fix crash case when destroying with tainted resources. [GH-412]
   * providers/aws: Refresh of launch configs and autoscale groups load
       the correct data and don't incorrectly recreate themselves. [GH-425]
   * providers/aws: Fix case where ELB would incorrectly plan to modify
@@ -20,8 +21,8 @@ BUG FIXES:
   * providers/aws: Retry deleting security groups for some amount of time
       if there is a dependency violation since it is probably just eventual
       consistency. [GH-436]
-  * providers/aws: Retry deleting subnet for some amount of time if there is a 
-      dependency violation since probably asynchronous destroy events take 
+  * providers/aws: Retry deleting subnet for some amount of time if there is a
+      dependency violation since probably asynchronous destroy events take
       place still. [GH-449]
   * providers/aws: Drain autoscale groups before deleting. [GH-435]
   * providers/aws: Fix crash case if launch config is manually deleted. [GH-421]
diff --git a/terraform/graph.go b/terraform/graph.go
index e8741e5d6..f79189195 100644
--- a/terraform/graph.go
+++ b/terraform/graph.go
@@ -1667,11 +1667,6 @@ func (n *GraphNodeResource) Expand() (*depgraph.Graph, error) {
 		return n.finalizeGraph(g, false)
 	}
 
-	if n.State != nil {
-		// Add the tainted resources
-		graphAddTainted(g, n.State)
-	}
-
 	return n.finalizeGraph(g, true)
 }