Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 6073)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 6074)
@@ -789,7 +789,5 @@
 
       FinalizePedestals(ped,pix,aidx);
-      FinalizeCharges(pix, 
-                      fIntensCam ? fIntensCam->GetAverageBadArea(aidx) : fCam->GetAverageBadArea(aidx),
-                      "area id");
+      FinalizeCharges(pix, chargecam->GetAverageBadArea(aidx),"area id");
     }
   
@@ -821,5 +819,6 @@
       *fLog << warn << "Could not calculate the photons flux from the F-Factor method " << endl;
       chargecam->SetFFactorMethodValid(kFALSE); 
-      return kFALSE;
+      if (!fIntensCam)
+	return kFALSE;
     }