Index: trunk/Mars/mbase/MEvtLoop.cc
===================================================================
--- trunk/Mars/mbase/MEvtLoop.cc	(revision 19344)
+++ trunk/Mars/mbase/MEvtLoop.cc	(revision 19345)
@@ -119,5 +119,8 @@
 {
     if (TestBit(kIsOwner) && fParList)
+    {
         delete fParList;
+        fParList = 0;
+    }
 }
 
Index: trunk/Mars/mbase/MParList.cc
===================================================================
--- trunk/Mars/mbase/MParList.cc	(revision 19344)
+++ trunk/Mars/mbase/MParList.cc	(revision 19345)
@@ -140,5 +140,9 @@
     //   garbage collection?
     delete fContainer;
+    fContainer = 0;
+
     delete fAutodelete;
+    fAutodelete = 0;
+
 }
 
Index: trunk/Mars/mbase/MTask.cc
===================================================================
--- trunk/Mars/mbase/MTask.cc	(revision 19344)
+++ trunk/Mars/mbase/MTask.cc	(revision 19345)
@@ -137,5 +137,8 @@
 {
     delete fStopwatch;
+    fStopwatch = 0;
+
     delete fListOfBranches;
+    fListOfBranches = 0;
 }
 
Index: trunk/Mars/mbase/MTaskList.cc
===================================================================
--- trunk/Mars/mbase/MTaskList.cc	(revision 19344)
+++ trunk/Mars/mbase/MTaskList.cc	(revision 19345)
@@ -127,4 +127,5 @@
 
     delete fTasks;
+    fTasks = 0;
 }
 
Index: trunk/Mars/mdata/MDataPhrase.cc
===================================================================
--- trunk/Mars/mdata/MDataPhrase.cc	(revision 19344)
+++ trunk/Mars/mdata/MDataPhrase.cc	(revision 19345)
@@ -540,5 +540,8 @@
 {
     if (fFormula)
+    {
         delete fFormula;
+        fFormula = 0;
+    }
 }
 
Index: trunk/Mars/mhbase/MH3.cc
===================================================================
--- trunk/Mars/mhbase/MH3.cc	(revision 19344)
+++ trunk/Mars/mhbase/MH3.cc	(revision 19345)
@@ -428,15 +428,27 @@
 {
     if (fHist)
+    {
         delete fHist;
+        fHist = 0;
+    }
 
     if (fConversion)
+    {
         delete fConversion;
+        fConversion = 0;
+    }
 
     if (fWeight)
+    {
         delete fWeight;
+        fWeight = 0;
+    }
 
     for (int i=0; i<4; i++)
         if (fData[i])
+        {
             delete fData[i];
+            fData[i] = 0;
+        }
 
     for (int i=0; i<3; i++)
Index: trunk/Mars/mhbase/MHn.cc
===================================================================
--- trunk/Mars/mhbase/MHn.cc	(revision 19344)
+++ trunk/Mars/mhbase/MHn.cc	(revision 19345)
@@ -154,5 +154,8 @@
     for (int i=0; i<fNum; i++)
         if (fHist[i])
+        {
             delete fHist[i];
+            fHist[i] = 0;
+        }
 }
 
Index: trunk/Mars/mhist/MHCamEvent.cc
===================================================================
--- trunk/Mars/mhist/MHCamEvent.cc	(revision 19344)
+++ trunk/Mars/mhist/MHCamEvent.cc	(revision 19345)
@@ -127,5 +127,8 @@
 {
     if (fSum)
+    {
         delete fSum;
+        fSum = 0;
+    }
 }
 
Index: trunk/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/Mars/mhist/MHCamera.cc	(revision 19344)
+++ trunk/Mars/mhist/MHCamera.cc	(revision 19345)
@@ -203,7 +203,13 @@
 {
     if (fGeomCam)
-      delete fGeomCam;
+    {
+        delete fGeomCam;
+        fGeomCam = 0;
+    }
     if (fNotify)
-      delete fNotify;
+    {
+        delete fNotify;
+        fNotify = 0;
+    }
 }
 
Index: trunk/Mars/mhvstime/MHSectorVsTime.cc
===================================================================
--- trunk/Mars/mhvstime/MHSectorVsTime.cc	(revision 19344)
+++ trunk/Mars/mhvstime/MHSectorVsTime.cc	(revision 19345)
@@ -122,5 +122,8 @@
 {
     if (fGraph)
+    {
         delete fGraph;
+        fGraph = 0;
+    }
 }
 
Index: trunk/Mars/mtools/MagicJam.cc
===================================================================
--- trunk/Mars/mtools/MagicJam.cc	(revision 19344)
+++ trunk/Mars/mtools/MagicJam.cc	(revision 19345)
@@ -194,5 +194,8 @@
 {
     if (fImage)
+    {
         delete fImage;
+        fImage = 0;
+    }
 }