diff --git a/Service/TrackSystemSvc/src/MarlinKalTestTrack.cc b/Service/TrackSystemSvc/src/MarlinKalTestTrack.cc
index 9f83748cb7a7df9fa1477ca20df7bbb1bc11a7cc..f41413eacaa43c691780c23da5154ed8bfce0a22 100644
--- a/Service/TrackSystemSvc/src/MarlinKalTestTrack.cc
+++ b/Service/TrackSystemSvc/src/MarlinKalTestTrack.cc
@@ -1015,10 +1015,13 @@ namespace MarlinTrk {
   }
   
   int MarlinKalTestTrack::getTrackerHitAtPositiveNDF( edm4hep::ConstTrackerHit& trkhit ) {
-
+    if(_trackHitAtPositiveNDF.isAvailable()){
       trkhit = _trackHitAtPositiveNDF;
       return success;    
-
+    }
+    else{
+      return error;
+    }
   }