Index: trunk/BNC/src/PPP/pppClient.cpp
===================================================================
--- trunk/BNC/src/PPP/pppClient.cpp	(revision 7887)
+++ trunk/BNC/src/PPP/pppClient.cpp	(revision 7888)
@@ -282,5 +282,5 @@
       unsigned nObs        = 0;
       for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-        t_pppSatObs* satObs = obsVector.at(ii);
+        const t_pppSatObs* satObs = obsVector.at(ii);
         if (satObs->prn().system() == 'R') {
           if (tLC == t_lc::dummy) {
Index: trunk/BNC/src/bncgetthread.cpp
===================================================================
--- trunk/BNC/src/bncgetthread.cpp	(revision 7887)
+++ trunk/BNC/src/bncgetthread.cpp	(revision 7888)
@@ -641,6 +641,7 @@
 #endif
     }
-
-    delete _query;
+    if (_query) {
+      delete _query;
+    }
     if      (_ntripVersion == "U") {
       _query = new bncNetQueryUdp();
Index: trunk/BNC/src/ephemeris.cpp
===================================================================
--- trunk/BNC/src/ephemeris.cpp	(revision 7887)
+++ trunk/BNC/src/ephemeris.cpp	(revision 7888)
@@ -36,5 +36,8 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_eph::setOrbCorr(const t_orbCorr* orbCorr) {
-  delete _orbCorr;
+  if (_orbCorr) {
+    delete _orbCorr;
+    _orbCorr = 0;
+  }
   _orbCorr = new t_orbCorr(*orbCorr);
 }
@@ -43,5 +46,8 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_eph::setClkCorr(const t_clkCorr* clkCorr) {
-  delete _clkCorr;
+  if (_clkCorr) {
+    delete _clkCorr;
+    _clkCorr = 0;
+  }
   _clkCorr = new t_clkCorr(*clkCorr);
 }
