Index: trunk/MagicSoft/Mars/mimage/MHHillas.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillas.cc	(revision 2095)
+++ trunk/MagicSoft/Mars/mimage/MHHillas.cc	(revision 2098)
@@ -242,4 +242,10 @@
 Bool_t MHHillas::Fill(const MParContainer *par, const Stat_t w)
 {
+    if (!par)
+    {
+        *fLog << err << "MHHillas::Fill: Pointer (!=NULL) expected." << endl;
+        return kFALSE;
+    }
+
     const MHillas &h = *(MHillas*)par;
 
@@ -247,10 +253,10 @@
     const Double_t scale = fUseMmScale ? 1 : fMm2Deg;
 
-    fLength ->Fill(scale*h.GetLength(), w);
-    fWidth  ->Fill(scale*h.GetWidth(), w);
-    fDistC  ->Fill(scale*d, w);
-    fCenter ->Fill(scale*h.GetMeanX(), scale*h.GetMeanY(), w);
-    fDelta  ->Fill(kRad2Deg*h.GetDelta(), w);
-    fSize   ->Fill(h.GetSize(), w);
+    fLength->Fill(scale*h.GetLength(), w);
+    fWidth ->Fill(scale*h.GetWidth(), w);
+    fDistC ->Fill(scale*d, w);
+    fCenter->Fill(scale*h.GetMeanX(), scale*h.GetMeanY(), w);
+    fDelta ->Fill(kRad2Deg*h.GetDelta(), w);
+    fSize  ->Fill(h.GetSize(), w);
 
     return kTRUE;
Index: trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc	(revision 2095)
+++ trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc	(revision 2098)
@@ -130,4 +130,10 @@
 Bool_t MHHillasSrc::Fill(const MParContainer *par, const Stat_t w)
 {
+    if (!par)
+    {
+        *fLog << err << "MHHillasSrc::Fill: Pointer (!=NULL) expected." << endl;
+        return kFALSE;
+    }
+
     const MHillasSrc &h = *(MHillasSrc*)par;
 
@@ -211,9 +217,20 @@
     pad->cd(4);
     gPad->SetBorderMode(0);
-    gPad->SetLogy();
+    //gPad->SetLogy();
     fCosDA->Draw();
 
     pad->Modified();
     pad->Update();
+}
+
+void MHHillasSrc::Paint(Option_t *opt)
+{
+    if (fCosDA->GetEntries()==0)
+        return;
+
+    TVirtualPad *savepad = gPad;
+    gPad->cd(4);
+    gPad->SetLogy();
+    gPad = savepad;
 }