diff --git a/engine/graph/engine.go b/engine/graph/engine.go
index a3247a2b..82e31564 100644
--- a/engine/graph/engine.go
+++ b/engine/graph/engine.go
@@ -144,7 +144,7 @@ func (obj *Engine) Validate() error {
 		}
 
 		if err := engine.Validate(res); err != nil {
-			return errwrap.Wrapf(err, "the Res did not Validate")
+			return fmt.Errorf("%s did not Validate: %v", res, err)
 		}
 	}
 	return nil
diff --git a/engine/graph/reverse.go b/engine/graph/reverse.go
index 6f98b060..d5a832cc 100644
--- a/engine/graph/reverse.go
+++ b/engine/graph/reverse.go
@@ -275,7 +275,7 @@ func (obj *State) ReversalWrite(str string, overwrite bool) error {
 		if str != oldStr {
 			obj.Logf("existing, pending, reversible resource exists")
 			//obj.Logf("diff:")
-			//obj.Logf("") // TODO: print the diff w/o and secret values
+			//obj.Logf("") // TODO: print the diff w/o secret values
 			return fmt.Errorf("existing, pending, reversible resource exists")
 		}
 	}
diff --git a/lib/main.go b/lib/main.go
index c7c5e2e4..5bc51d43 100644
--- a/lib/main.go
+++ b/lib/main.go
@@ -661,7 +661,7 @@ func (obj *Main) Run() error {
 
 			if err := obj.ge.Validate(); err != nil { // validate the new graph
 				obj.ge.Abort() // delete graph
-				Logf("error validating the new graph: %+v", err)
+				Logf("graph validate failed: %+v", err)
 				continue
 			}
 
@@ -967,6 +967,9 @@ func (obj *Main) Run() error {
 
 	reterr := obj.exit.Error() // wait for exit signal (block until arrival)
 
+	// XXX: The reversals don't get a chance to run if we ^C things.
+	// XXX: Add a singular deploy of those before we shut down completely.
+
 	Logf("destroy...")
 
 	// tell inner main loop to exit