Index: /trunk/FACT++/src/DataCalib.cc
===================================================================
--- /trunk/FACT++/src/DataCalib.cc	(revision 14147)
+++ /trunk/FACT++/src/DataCalib.cc	(revision 14148)
@@ -85,5 +85,5 @@
     if (h->NPix != 1440)
     {
-        fMsg.Error("Number of pixels in header not 1440.");
+        fMsg.Error("Number of pixels in header for run " << GetRunId() << " not 1440.");
         return false;
     }
@@ -91,5 +91,5 @@
     if (fProcessing)
     {
-        fMsg.Warn("Previous DRS calibration run not yet finished!");
+        fMsg.Warn("Previous DRS calibration run not yet finished (current run " << GetRunId() << ")");
         return false;
     }
@@ -97,5 +97,5 @@
     if (fData.fStep==3)
     {
-        fMsg.Warn("DRS Calibration already finished... please restart!");
+        fMsg.Warn("DRS Calibration already finished before current run " << GetRunId() << "... please restart!");
         return false;
     }
@@ -104,5 +104,5 @@
     {
         ostringstream msg;
-        msg << "Region of interest not 1024, but " << h->Nroi << " in step " << fData.fStep <<  " ... as it ought to be.";
+        msg << "Region of interest of run " << GetRunId() << " not 1024, but " << h->Nroi << " in step " << fData.fStep <<  " ... as it ought to be.";
         fMsg.Error(msg);
         return false;
@@ -262,4 +262,11 @@
 bool DataCalib::Close(RUN_TAIL *tail)
 {
+    if (fNumEntries==0)
+    {
+        ostringstream str;
+        str << "DRS calibration run (run=" << GetRunId() << ", step=" << fData.fStep << ", roi=" << roi << ") has 0 events.";
+        Warn(str);
+    }
+
     if (fData.fStep==0)
     {
@@ -311,10 +318,10 @@
 
             ostringstream str;
-            str << "Wrote DRS calibration data (step=" << fData.fStep << ", roi=" << fData.fRoi << ") to '" << filename << "'";
+            str << "Wrote DRS calibration data (run=" << GetRunId() << ", step=" << fData.fStep << ", roi=" << fData.fRoi << ") to '" << filename << "'";
             Info(str);
         }
         catch (const exception &e)
         {
-            Error("Exception writing '"+filename+"': "+e.what());
+            Error("Exception writing run "+to_string(GetRunId())+" '"+filename+"': "+e.what());
         }
     }