X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDtrigger.cxx;h=33777901c057b85c59471facc1242414947ba580;hb=31af5828f154e8712a0f26fa19c698e91e963790;hp=48ef1498fd799bf4b0b20670c370f00cbe6a4890;hpb=3fcb9908bdfcf8dbdba8a45a79e1421bf42e716b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDtrigger.cxx b/TRD/AliTRDtrigger.cxx
index 48ef1498fd7..33777901c05 100644
--- a/TRD/AliTRDtrigger.cxx
+++ b/TRD/AliTRDtrigger.cxx
@@ -272,6 +272,8 @@ Bool_t AliTRDtrigger::ReadDigits()
   AliLoader* loader = fRunLoader->GetLoader("TRDLoader");
   if (!loader->TreeD()) loader->LoadDigits();
 
+  if (!loader->TreeD()) return kFALSE;
+
   return (fDigitsManager->ReadDigits(loader->TreeD()));
 
 }
@@ -414,12 +416,16 @@ Bool_t AliTRDtrigger::MakeTracklets(Bool_t makeTracks)
 
         // Get the digits
         fDigits = fDigitsManager->GetDigits(idet);
+	if (!fDigits) return kFALSE;
         fDigits->Expand();
         fTrack0 = fDigitsManager->GetDictionary(idet,0);
+	if (!fTrack0) return kFALSE;
         fTrack0->Expand();
         fTrack1 = fDigitsManager->GetDictionary(idet,1);
+	if (!fTrack1) return kFALSE;
         fTrack1->Expand();
         fTrack2 = fDigitsManager->GetDictionary(idet,2); 
+	if (!fTrack2) return kFALSE;
         fTrack2->Expand();
 
 	for (Int_t iRob = 0; iRob < fNROB; iRob++) {
@@ -435,8 +441,9 @@ Bool_t AliTRDtrigger::MakeTracklets(Bool_t makeTracks)
 
 	    row = fMCM->GetRow();
 
-	    if (row < 0 || row > nRowMax) {
+	    if (row < 0 || row >= nRowMax) {
 	      Error("MakeTracklets","MCM row number out of range.");
+	      continue;
 	    }
 
 	    fMCM->GetColRange(col1,col2);