diff --git a/terraform/node_resource_apply.go b/terraform/node_resource_apply.go
index 0219e349b..f609b7dd5 100644
--- a/terraform/node_resource_apply.go
+++ b/terraform/node_resource_apply.go
@@ -75,6 +75,11 @@ func (n *NodeApplyableResource) evalTreeDataResource(
 
 	return &EvalSequence{
 		Nodes: []EvalNode{
+			// Build the instance info
+			&EvalInstanceInfo{
+				Info: info,
+			},
+
 			// Get the saved diff for apply
 			&EvalReadDiff{
 				Name: stateId,
diff --git a/terraform/shadow_resource_provider.go b/terraform/shadow_resource_provider.go
index 4976fdc66..9741d7e79 100644
--- a/terraform/shadow_resource_provider.go
+++ b/terraform/shadow_resource_provider.go
@@ -682,7 +682,7 @@ func (p *shadowResourceProviderShadow) ReadDataDiff(
 		p.ErrorLock.Lock()
 		defer p.ErrorLock.Unlock()
 		p.Error = multierror.Append(p.Error, fmt.Errorf(
-			"Unknown 'ReadDataDiff' shadow value: %#v", raw))
+			"Unknown 'ReadDataDiff' shadow value for %q: %#v", key, raw))
 		return nil, nil
 	}
 
@@ -718,7 +718,7 @@ func (p *shadowResourceProviderShadow) ReadDataApply(
 		p.ErrorLock.Lock()
 		defer p.ErrorLock.Unlock()
 		p.Error = multierror.Append(p.Error, fmt.Errorf(
-			"Unknown 'ReadDataApply' shadow value: %#v", raw))
+			"Unknown 'ReadDataApply' shadow value for %q: %#v", key, raw))
 		return nil, nil
 	}