1 files changed, 9 insertions, 2 deletions
diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index 30a7e58d5..aea983cbb 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -154,8 +154,15 @@ KnotHolder::knot_clicked_handler(SPKnot *knot, guint state)
     }
 
     // for drag, this is done by ungrabbed_handler, but for click we must do it here
-    DocumentUndo::done(saved_item->document, object_verb,
-                       _("Change handle"));
+    
+    if (saved_item) { //increasingly aggressive sanity checks
+       if (saved_item->document) {
+            if (object_verb <= SP_VERB_LAST && object_verb >= SP_VERB_INVALID) {
+                DocumentUndo::done(saved_item->document, object_verb,
+                                   _("Change handle"));
+            }
+       }
+    } // else { abort(); }
 }
 
 void