From 8048e9a5851f0596461c9fca3f81ca50d90b8834 Mon Sep 17 00:00:00 2001
From: Martin Atkins <mart@degeneration.co.uk>
Date: Thu, 6 Sep 2018 17:13:25 -0700
Subject: [PATCH] plans/objchange: Don't panic if old or new values are null

---
 plans/objchange/compatible.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plans/objchange/compatible.go b/plans/objchange/compatible.go
index 34cf576c43..fda7d83a26 100644
--- a/plans/objchange/compatible.go
+++ b/plans/objchange/compatible.go
@@ -176,6 +176,16 @@ func assertValueCompatible(planned, actual cty.Value, path cty.Path) []error {
 		return errs
 	}
 
+	if actual.IsNull() {
+		if planned.IsNull() {
+			return nil
+		}
+		errs = append(errs, path.NewErrorf("was %#v, but now null", planned))
+	}
+	if planned.IsNull() {
+		errs = append(errs, path.NewErrorf("was null, but now %#v", actual))
+	}
+
 	ty := planned.Type()
 	switch {