Merge remote-tracking branch 'origin/master' into TPCdev

[u/mrichter/AliRoot.git] / PWGPP / TPC / AliMaterialBudget.cxx

diff --git a/PWGPP/TPC/AliMaterialBudget.cxx b/PWGPP/TPC/AliMaterialBudget.cxx
index 178718d83b1f4b93f4bd0563c54034bc818ecf41..4f669c8b6386a528e6997176953992057b4360e0 100644 (file)
--- a/PWGPP/TPC/AliMaterialBudget.cxx
+++ b/PWGPP/TPC/AliMaterialBudget.cxx
@@ -693,6 +693,7 @@ void AliMaterialBudget::FindPairs(AliESDEvent * event) {
    if (!trackIn) continue;
    if (!trackOut) continue;
    AliESDfriendTrack *friendTrack = ESDfriend->GetTrack(i);
+   if (!friendTrack) continue;
    TObject *calibObject;
    AliTPCseed *seed = 0;
    for (Int_t l=0;(calibObject=friendTrack->GetCalibObject(l));++l) {