diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
index 7af0e8744b98fc3b75e841b4f9ae33a999956db2..6442db110dd6f0b545b124d240098d30b2181f19 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
@@ -137,14 +137,19 @@ StatusCode InDetGlobalPixelTool::fillHistograms()
   m_tracks=m_combined_tracks;
   int nPixelHits=0;
 
-
+  if(m_tracks==0)
+    {
+      ATH_MSG_WARNING( "No Tracks. Leaving InDetGlobalPixelTool!" );
+      return StatusCode::SUCCESS;	
+    }
+    
   std::vector<Identifier> myRDOIDs;
   for (int i=0; i<(int)m_tracks->size(); i++)
     {
       const Trk::Track *track=(*m_tracks)[i];
       if (track == 0) 
 	{
-	  if (msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "no pointer to track!!!" << endreq;
+	  ATH_MSG_ERROR( "no pointer to track!!!" );
 	  break;
 	}
       const Trk::TrackSummary* summary = m_trkSummaryTool->createSummary(*track);
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx
index 2df8da5a6a0f36a92b84146e657cb5ca5f8590d3..f26536fc6f9576844b81cf1f5fba4039f7256251 100755
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx
@@ -3158,7 +3158,7 @@ SCTHitsNoiseMonTool::makeVectorOfTrackRDOIdentifiers() {
 
   sc = evtStore()->retrieve(m_tracks, m_tracksName);
   if (sc.isFailure()) {
-    msg(MSG::FATAL) << "No tracks for you!" << endmsg;
+    msg(MSG::WARNING) << "No tracks for you! Leaving SCTHitsNoiseMonTool" << endmsg;
     return sc;
   }
   // Only do for events with less than some number of tracks