diff --git a/Detectors/Align/CMakeLists.txt b/Detectors/Align/CMakeLists.txt
index d99e1a803612f..5702491e0ba0e 100644
--- a/Detectors/Align/CMakeLists.txt
+++ b/Detectors/Align/CMakeLists.txt
@@ -9,7 +9,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-#add_compile_options(-O0 -g -fPIC)
+#add_compile_options(-O0 -g -fPIC -fno-omit-frame-pointer)
 
 o2_add_library(Align
                SOURCES  src/GeometricalConstraint.cxx
diff --git a/Detectors/Align/src/Controller.cxx b/Detectors/Align/src/Controller.cxx
index 43143f89e7ca4..28109d8ba6c07 100644
--- a/Detectors/Align/src/Controller.cxx
+++ b/Detectors/Align/src/Controller.cxx
@@ -307,16 +307,20 @@ void Controller::process()
                        << "fit=" << trcAlgRef
                        << "\n";
           }
-          o2::dataformats::DCA origDCA, fitDCA;
-          const auto& conf = AlignConfig::Instance();
-          if (prop->propagateToDCABxByBz(*vtx, trcOrig, conf.maxStep, MatCorrType(conf.matCorType), &origDCA) &&
-              prop->propagateToDCABxByBz(*vtx, trcAlgRef, conf.maxStep, MatCorrType(conf.matCorType), &origDCA)) {
-            (*mDBGOut) << "trcompatpv"
-                       << "orig=" << trcOrig
-                       << "origDCA=" << origDCA
-                       << "fit=" << trcAlgRef
-                       << "fitDCA=" << fitDCA
-                       << "\n";
+          if (vtx) {
+            o2::dataformats::DCA origDCA, fitDCA;
+            trackParam_t trcOrigPV(trcIn.getX(), trcIn.getAlpha(), dpar, dcov, trcIn.getCharge());
+            trackParam_t trcFitPV(*mAlgTrack);
+            const auto& conf = AlignConfig::Instance();
+            if (prop->propagateToDCABxByBz(*vtx, trcOrigPV, conf.maxStep, MatCorrType(conf.matCorType), &origDCA) &&
+                prop->propagateToDCABxByBz(*vtx, trcFitPV, conf.maxStep, MatCorrType(conf.matCorType), &fitDCA)) {
+              (*mDBGOut) << "trcompatpv"
+                         << "orig=" << trcOrigPV
+                         << "origDCA=" << origDCA
+                         << "fit=" << trcFitPV
+                         << "fitDCA=" << fitDCA
+                         << "\n";
+            }
           }
         }
         // RS: this is to substitute the refitter track by MC truth, just for debugging