Index: trunk/BNC/src/bncgetthread.cpp
===================================================================
--- trunk/BNC/src/bncgetthread.cpp	(revision 10776)
+++ trunk/BNC/src/bncgetthread.cpp	(revision 10936)
@@ -403,4 +403,6 @@
   delete _serialPort;
   delete _latencyChecker;
+  delete _nmeaServer;
+  delete _nmeaSockets;
   emit getThreadFinished(_staID);
 }
@@ -414,10 +416,6 @@
     _nmeaPortsMap.remove(_staID);
   }
-  if (_nmeaServer) {
-    delete _nmeaServer;
-  }
-  if (_nmeaSockets) {
-    delete _nmeaSockets;
-  }
+  delete _nmeaServer;  _nmeaServer  = nullptr;
+  delete _nmeaSockets; _nmeaSockets = nullptr;
 
 #ifdef BNC_DEBUG