diff --git a/src/AirspaceManagement/AirspaceManager.cc b/src/AirspaceManagement/AirspaceManager.cc
index 02714915ec2304ee0fa8aeea3c2a31a8aff0358e..e34d2b8adadf6da892962bb37278c2771c31d38e 100644
--- a/src/AirspaceManagement/AirspaceManager.cc
+++ b/src/AirspaceManagement/AirspaceManager.cc
@@ -48,21 +48,16 @@ AirspaceManager::AirspaceManager(QGCApplication* app, QGCToolbox* toolbox)
 //-----------------------------------------------------------------------------
 AirspaceManager::~AirspaceManager()
 {
-    if(_advisories) {
-        delete _advisories;
-    }
-    if(_weatherProvider) {
-        delete _weatherProvider;
-    }
-    if(_ruleSetsProvider) {
-        delete _ruleSetsProvider;
-    }
-    if(_airspaces) {
-        delete _airspaces;
-    }
-    if(_flightPlan) {
-        delete _flightPlan;
-    }
+    delete _advisories;
+    _advisories = nullptr;
+    delete _weatherProvider;
+    _weatherProvider = nullptr;
+    delete _ruleSetsProvider;
+    _ruleSetsProvider = nullptr;
+    delete _airspaces;
+    _airspaces = nullptr;
+    delete _flightPlan;
+    _flightPlan = nullptr;
 }
 
 //-----------------------------------------------------------------------------