diff --git a/src/ui/MapWidget.cc b/src/ui/MapWidget.cc
index 5673d504387c4a8b8bc50080c71fe8dd54d6b23f..028d4bc54a2d5b3edb4a2b2c3056d81244fb4e1e 100644
--- a/src/ui/MapWidget.cc
+++ b/src/ui/MapWidget.cc
@@ -378,16 +378,22 @@ void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate){
   int temp = 0;
   Point* point2Find;
   point2Find = wpIndex[geom->name()];
-  point2Find->setCoordinate(coordinate);
 
-  point2Find = dynamic_cast <Point*> (geom);
-  point2Find->setCoordinate(coordinate);
+  if (point2Find)
+  {
+      point2Find->setCoordinate(coordinate);
 
- // qDebug() << geom->name();
-  temp = geom->get_myIndex();
-  //qDebug() << temp;
-  emit sendGeometryEndDrag(coordinate,temp);
+      point2Find = dynamic_cast <Point*> (geom);
+      if (point2Find)
+      {
+          point2Find->setCoordinate(coordinate);
 
+          // qDebug() << geom->name();
+          temp = geom->get_myIndex();
+          //qDebug() << temp;
+          emit sendGeometryEndDrag(coordinate,temp);
+      }
+  }
 
 }