diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 4ccd958b5e272e62247246d99037d8ebc197a591..b3d03e81198bd07c72ee2701da5f7efc85bc0b72 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -267,7 +267,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 		/// <returns>True if RD allocation is needed; false otherwise.</returns>
 		public static bool EvaluateLHSubgroupConditions(IResultEntry result)
 		{
-			Meter electricOprerationalRange = result.VectoRunData.JobType.IsBatteryElectric() ?
+			Meter electricOprerationalRange = result.VectoRunData?.JobType.IsBatteryElectric() ?? false ?
 				(result.ActualChargeDepletingRange ?? 0.SI<Meter>()) :
 				double.MaxValue.SI<Meter>();
 
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index 0fd4692f18febea7895cb4fdde309fd5f03744d8..86d4508bb77e12e3c71da7f6b346185ef1a0325b 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -290,6 +290,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 				}
 
 				WeightingFactor = weightingFactor;
+				PrimaryResult = runData.PrimaryResult;
 			}
 
 			public void SetResultWeightingFactor(double weightingFactor)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
index 3f50411e9725ea42292f01e6f9e2b87436356b5a..c3b4a4805c2016797167187f967efc8735c9e6f3 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
@@ -286,7 +286,7 @@ namespace TUGraz.VectoCore.OutputData.XML
                 throw new NotImplementedException();
             }
 
-			public VectoRunData VectoRunData => throw new NotImplementedException();
+			public VectoRunData VectoRunData => null;
             public VectoRun.Status Status { get; set; }
             public OvcHevMode OVCMode { get; set; }
             public MissionType Mission { get; set; }