diff --git a/terraform/eval_import_state.go b/terraform/eval_import_state.go
index 55a0f5c55e..23f88155ce 100644
--- a/terraform/eval_import_state.go
+++ b/terraform/eval_import_state.go
@@ -2,6 +2,7 @@ package terraform
 
 import (
 	"fmt"
+	"log"
 
 	"github.com/hashicorp/terraform/addrs"
 	"github.com/hashicorp/terraform/tfdiags"
@@ -38,6 +39,14 @@ func (n *EvalImportState) Eval(ctx EvalContext) (interface{}, error) {
 			"import %s (id: %s): %s", n.Info.HumanId(), n.Id, err)
 	}
 
+	for _, s := range state {
+		if s == nil {
+			log.Printf("[TRACE] EvalImportState: import %s %q produced a nil state", n.Info.HumanId(), n.Id)
+			continue
+		}
+		log.Printf("[TRACE] EvalImportState: import %s %q produced state for %s with id %q", n.Info.HumanId(), n.Id, s.Ephemeral.Type, s.ID)
+	}
+
 	if n.Output != nil {
 		*n.Output = state
 	}
diff --git a/terraform/eval_refresh.go b/terraform/eval_refresh.go
index 2490a3111d..fab32f7799 100644
--- a/terraform/eval_refresh.go
+++ b/terraform/eval_refresh.go
@@ -43,6 +43,9 @@ func (n *EvalRefresh) Eval(ctx EvalContext) (interface{}, error) {
 	if err != nil {
 		return nil, fmt.Errorf("%s: %s", n.Addr.Absolute(ctx.Path()), err.Error())
 	}
+	if state == nil {
+		log.Printf("[TRACE] EvalRefresh: after refresh, %s has nil state", n.Addr)
+	}
 
 	// Call post-refresh hook
 	err = ctx.Hook(func(h Hook) (HookAction, error) {