diff --git a/core/worldmap-save.c b/core/worldmap-save.c
index 27e31f482..a2454ce2b 100644
--- a/core/worldmap-save.c
+++ b/core/worldmap-save.c
@@ -34,7 +34,7 @@ void writeMarkers(struct membuffer *b, const bool selected_only)
 				continue;
 		}
 		struct dive_site *ds = get_dive_site_for_dive(dive);
-		if (!ds || !dive_site_has_gps_location(ds))
+		if (!dive_site_has_gps_location(ds))
 			continue;
 		put_degrees(b, ds->location.lat, "temp = new google.maps.Marker({position: new google.maps.LatLng(", "");
 		put_degrees(b, ds->location.lon, ",", ")});\n");
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index aad201722..b4b64b4d8 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -24,14 +24,14 @@ MapWidgetHelper::MapWidgetHelper(QObject *parent) : QObject(parent)
 
 QGeoCoordinate MapWidgetHelper::getCoordinates(struct dive_site *ds)
 {
-	if (!ds || !dive_site_has_gps_location(ds))
+	if (!dive_site_has_gps_location(ds))
 		return QGeoCoordinate(0.0, 0.0);
 	return QGeoCoordinate(ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001);
 }
 
 void MapWidgetHelper::centerOnDiveSite(struct dive_site *ds)
 {
-	if (!ds || !dive_site_has_gps_location(ds)) {
+	if (!dive_site_has_gps_location(ds)) {
 		// dive site with no GPS
 		m_mapLocationModel->setSelected(ds, false);
 		QMetaObject::invokeMethod(m_map, "deselectMapLocation");