diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index d38220f4c5c5150643b47ff54e1d50b01553765d..4a1a314200338f50700c7ecddf93d54d2420747d 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -1990,16 +1990,18 @@ void GrDrag::setSelected(GrDragger *dragger, bool add_to_selection, bool overrid
 
     // Don't allow selecting a mesh handle or mesh tensor.
     // We might want to rethink since a dragger can have draggables of different types.
-    if ( dragger->isA( POINT_MG_HANDLE ) || dragger->isA( POINT_MG_TENSOR ) ) return;
+    if (dragger && (dragger->isA(POINT_MG_HANDLE) || dragger->isA(POINT_MG_TENSOR))) {
+        return;
+    }
 
     if (add_to_selection) {
         if (!dragger) return;
         if (override) {
-                selected.insert(dragger);
+            selected.insert(dragger);
             dragger->select();
             seldragger = dragger;
         } else { // toggle
-            if(selected.find(dragger)!=selected.end()) {
+            if (selected.find(dragger) != selected.end()) {
                 selected.erase(dragger);
                 dragger->deselect();
                 if (!selected.empty()) {